From 880838e8b1bfd37ae77a887105930f342d2ed6ac Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 8 Nov 2022 16:12:42 +0800
Subject: [PATCH 01/90] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 31969683..18064d82 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1716,22 +1716,23 @@ export default {
     };
     const showDrawerAddDiscuss = () => {
       state.adddiscussvisible = true;
-    };
+    };s
     //打开编辑讨论的弹窗
-    const showEditAddDiscuss = (id)=>{
+    const showEditAddDiscuss = (id,eleId)=>{
       state.editDiscussId = id
+      state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     }
-    const showDrawerAddActive = () => {
+    const showDrawerAddActive = (id,eleId) => {
       state.addactivevisible = true;
     };
-    const showDrawerAddEval = () => {
+    const showDrawerAddEval = (id,eleId) => {
       state.addevalvisible = true;
     };
-    const showDrawerAddInvist = () => {
+    const showDrawerAddInvist = (id,eleId) => {
       state.addinvistvisible = true;
     };
-    const showDrawerAddVote = () => {
+    const showDrawerAddVote = (id,eleId) => {
       state.addvotevisible = true;
     };
     const showConfirm = () => {
@@ -1831,7 +1832,7 @@ export default {
       state.EditLiveId = id;
     };
     //打开测评的弹窗
-    const showEditEvalDrawer = (id) => {
+    const showEditEvalDrawer = (id，eleId) => {
       console.log('222222222222222222222',id);
       state.addevalvisible = true;
       state.EditRefId = id;
@@ -1845,17 +1846,17 @@ export default {
         showEditRefDrawer(id);
       } 
       else if (type == "直播") {
-        showEditLiveDrawer(id);
+        showEditLiveDrawer(id,eleId)，;
       } else if (type == "测评") {
-        showEditEvalDrawer(id)
+        showEditEvalDrawer(id,eleId)
       } else if (type == "评估") {
-        showDrawerAddInvist(id);
+        showDrawerAddInvist(id,eleId);
       } else if (type == "投票") {
-        showDrawerAddVote(id);
+        showDrawerAddVote(id,eleIdd);
       } else if (type == "讨论") {
-        showEditAddDiscuss(id);
+        showEditAddDiscuss(id,eleId);
       } else if (type == "活动") {
-        showDrawerAddActive(id);
+        showDrawerAddActive(id,eleId);
       }else if (type == "作业") {
         showDrawerAddHomework(id,eleId);
       }else if (type == "考试") {

From ac807d9dc67abaaab842d9072335045d98c8b942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 8 Nov 2022 16:13:40 +0800
Subject: [PATCH 02/90] =?UTF-8?q?feat:=E8=AE=A8=E8=AE=BA=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexDiscuss.js               |   7 +-
 src/components/drawers/AddDiscuss.vue |  78 +++++++++----
 src/views/projectcenter/TaskAdd.vue   | 159 +++++++++++++++++++++++++-
 3 files changed, 215 insertions(+), 29 deletions(-)

diff --git a/src/api/indexDiscuss.js b/src/api/indexDiscuss.js
index 5167f69c..7141214c 100644
--- a/src/api/indexDiscuss.js
+++ b/src/api/indexDiscuss.js
@@ -1,13 +1,16 @@
 import http from "./config";
+//import qs from 'qs';
 
 //创建讨论
 export const createDiscuss = (obj) => http.post('/discuss/createDiscuss', obj);
 
 //获取讨论信息接口
-export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', { params: obj });
+export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj);
 
 //删除讨论接口
 export const deleteDiscuss = (obj) => http.post('/discuss/deleteDiscuss', { params: obj });
 
 //修改讨论接口
-export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss',  obj );
\ No newline at end of file
+export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss',  obj );
+//修改阶段任务信息
+export const  updateTask=(obj)=>http.post('/admin/project/editTask',obj)
\ No newline at end of file
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index e13afc92..5005158b 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -144,13 +144,34 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
       ctx.emit("update:edit", false);
+      console.log("编辑状态",props.edit);
       state.inputV1 = "";
       state.textV1 = "";
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if(bool){
+        if(props.isStudiscuss == false){
+          if(props.edit){
+            //编辑讨论
+              console.log("props.editDiscussId",props.editDiscussId)
+                let formData = new FormData();
+                formData.append('discussId',props.editDiscussId);
+                api.getDiscussDetail(formData).then(res => {
+                  console.log('获取讨论信息成功',res.data.data)
+                  //更新讨论信息
+                  state.inputV1 = res.data.data.discussName;
+                  state.textV1 = res.data.data.discussExplain;
+                  state.checkedC1 = res.data.data.discussSettings;
+                }).catch(err=>{
+                  console.log('获取讨论信息失败',err)
+                })
+            
+          }
+        }
+      }
     };
-
+    //console.log("编辑状态",props.edit);
     //创建讨论（项目任务列表）
     const createDiscuss = () => {
       if (!state.inputV1) {
@@ -169,26 +190,9 @@ export default {
         discussTag: "", //是否必修的标识
         updateTime: "", //更新时间
         updateUser: 0, //更新人
-        projectId: 0, //项目id
+        projectId: props.projectId, //项目id
       };
-      if(props.edit){
-        //console.log("编辑");
-        console.log("props.editDiscussId",props.editDiscussId)
-        
-        let obj = {
-         discussId: props.editDiscussId,
-        }
-        console.log(obj)
-        api
-          .getDiscussDetail(obj)
-          .then((res) => {
-            console.log("获取成功",res.data);
-          })
-          .catch((err) => {
-            console.log("获取失败",err.data);
-          })
-       
-      }else{
+      if(props.edit == false){
         api
         .createDiscuss(obj)
         .then((res) => {
@@ -213,8 +217,7 @@ export default {
               console.log("新增关卡任务成功",res);
               setTimeout(()=>{
                  message.success("创建成功");
-          ctx.emit("update:adddiscussVisible", false);
-                closeDrawer();
+                ctx.emit("update:adddiscussVisible", false);
               state.addLoading=false
               },1000)
             }).catch(err => {
@@ -229,7 +232,7 @@ export default {
               flag: true,
               name: obj.discussName,
               projectId: props.projectId,
-              projectTaskId: 0,
+              projectTaskId: "",
               stageId: props.chooseStageId,
               type: 8,
             })
@@ -248,10 +251,35 @@ export default {
          })
         .catch((err) => {
           console.log("创建失败", err);
-        });
+        }); 
+      }else{
+        api
+          .updateDiscuss(obj)
+          .then((res)=> {
+            console.log("更新成功",res)
+          let taskObj={
+            courseId: res.data.data.discussId,
+            name: obj.discussName,
+            projectId: props.projectId,
+            projectTaskId: "",
+            stageId: props.stageId,
+            type: 8,
+          
+          }
+            api.updateTask(taskObj).then(taskRes=>{
+            console.log('更新阶段任务成功',taskRes)
+            }).catch(taskErr=>{
+              console.log('更新阶段任务失败',taskErr)
+            })
+          })
+          .catch((err) => {
+            console.log("更新失败",err)
+          })
       }
-      
+         
+         
     };
+    
     return {
       ...toRefs(state),
       afterVisibleChange,
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 78618837..448471d9 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -306,7 +306,7 @@
         <div class="boomcen">
           <div class="onerow">
             <div class="taskmain">任务列表</div>
-            <button class="btn" @click="moveTask">移动任务到阶段</button>
+            <button class="btn" @click="showChangeModal">移动任务到阶段</button>
             <div class="edit" @click="deleteTaskAll">
               <img
                 class="editimg"
@@ -751,6 +751,44 @@
         </div>
       </div>
     </a-modal>
+    <!-- 移动任务到阶段 -->
+    <a-modal
+        style="padding: 0"
+        :closable="sh"
+        v-model:visible="visiblene"
+        :footer="null"
+        centered="true"
+        wrapClassName="changeModal"
+      >
+        <div class="con">
+          <div class="header">
+            <div class="inhe">
+              <div class="mod"></div>
+              <div class="tz">选择任务移动到阶段</div>
+            </div>
+          </div>
+          <div class="mid">
+            <div class="inher">
+              <div class="cur">已选中{{selectRow.length}}个任务</div>
+              <div class="select">
+                <a-select
+                  v-model:value="curLevel"
+                  style="width: 100%"
+                  placeholder="请选择关卡"
+                  :options="projectNameList4"
+                  @change="selectProjectName4"
+                  allowClear
+                  showSearch
+                ></a-select>
+              </div>
+              <div class="btn">
+                <button class="sameb btn1" @click="closeChangeModal">取消</button>
+                <button class="sameb btn2" @click="moveTask">确定</button>
+              </div>
+            </div>
+          </div>
+        </div></a-modal
+      >
   </div>
 </template>
 
@@ -993,6 +1031,7 @@ export default {
       selectedRowKeys: [],
       valuesname: "",
       valuesnotice: "",
+      visiblene: false,//移动任务弹窗
       confirmModal: false, //确认添加阶段弹窗
       cC: false,
       cancelModal: false, //确认取消阶段弹窗
@@ -1006,6 +1045,7 @@ export default {
       deleteActivityID: null, //删除活动id
       deleteID: "",
       selectRow: [], //选择行
+      curLevel: [], //阶段名称
       selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
     console.log("projectId", state.projectId);
@@ -1251,13 +1291,19 @@ export default {
             if (leng > 0) {
               //获取任务列表
               let arr = res.data.data.stageList[0].taskList;
+              console.log('任务列表',arr)
               getTableData(arr);
             }
 
             let stagearr = res.data.data.stageList;
-            console.log(stagearr, 111111);
+            let arrlist = state.curLevel;
+            //console.log(stagearr, 111111);
             if (stagearr.length > 0) {
               getStageData(stagearr);
+              stagearr.map(value => {
+                console.log(value);
+                arrlist.push();
+              })
             }
             //给阶段id赋初始值
             state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
@@ -1638,6 +1684,12 @@ export default {
           getTask();
         });
     };
+    const showChangeModal = () => {
+      state.visiblene = true;
+    }
+    const closeChangeModal = () => {
+      state.visiblene = false;
+    };
     //移动任务到阶段
     const moveTask = () => {
       let obj = {
@@ -1917,6 +1969,8 @@ export default {
       closeCancel,
       showDelete,
       closeDelete,
+      showChangeModal,
+      closeChangeModal,
       changebgc,
       getTask,
       deleteLiveBroadcast,
@@ -2095,6 +2149,107 @@ export default {
     }
   }
 }
+.changeModal {
+  .ant-modal {
+    width: 549px !important;
+    height: 245px !important;
+    .ant-modal-content {
+      width: 549px !important;
+      height: 245px !important;
+      .ant-modal-body {
+        padding: 0 !important;
+        width: 549px !important;
+        height: 245px !important;
+        .con {
+          // background-color: #bfa;
+          width: 100%;
+          height: 100%;
+
+          .header {
+            width: 100%;
+            display: flex;
+            height: 68px;
+            position: relative;
+            justify-content: center;
+
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+            .inhe {
+              width: 80%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              .mod {
+                left: 30px;
+                top: 27px;
+                position: absolute;
+                width: 18px;
+                height: 17px;
+                background-image: url(../../assets/images/leveladd/mod.png);
+              }
+              .tz {
+                color: #000000;
+                font-weight: 400;
+                font-size: 16px;
+              }
+              .mg {
+                width: 20px;
+                height: 20px;
+                background-image: url(../../assets/images/basicinfo/close22.png);
+                background-size: 100% 100%;
+                cursor: pointer;
+              }
+            }
+          }
+          .mid {
+            width: 100%;
+            display: flex;
+            height: 100%;
+            justify-content: center;
+            .inher {
+              width: 80%;
+              height: 100%;
+              .cur {
+                color: #6f6f6f;
+                font-size: 14px;
+              }
+              .select {
+                margin-top: 10px;
+              }
+              .btn {
+                width: 100%;
+                display: flex;
+                justify-content: center;
+                margin-top: 30px;
+                .sameb {
+                  width: 100px;
+                  height: 40px;
+                  font-size: 14px;
+
+                  border-radius: 8px;
+                }
+                .btn1 {
+                  color: #4ea6ff;
+                  background: #ffffff;
+                  border: 1px solid #4ea6ff;
+                }
+                .btn2 {
+                  margin-left: 16px;
+                  border: 0;
+                  color: #ffffff;
+                  background: #4ea6ff;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 .info {
   width: 78%;
   // background-color: lightcoral;

From e14b5a2bce29be34378b0382bd5fab91fa1c74a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Tue, 8 Nov 2022 16:56:03 +0800
Subject: [PATCH 03/90] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=85=B3?=
 =?UTF-8?q?=E5=8D=A1=E8=B7=AF=E5=BE=84=E4=B8=8B=20=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=92=8C=E4=BD=9C=E4=B8=9A=E7=9A=84=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E6=B7=BB=E5=8A=A0=EF=BC=8C?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0loading=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddHomework.vue    | 70 ++++++++++++------
 src/components/drawers/AddTest.vue        | 89 +++++++++++++++++------
 src/views/learningpath/LevelAddDetail.vue | 82 ++++++++++++++-------
 3 files changed, 168 insertions(+), 73 deletions(-)

diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index a571428d..fa3a1fe9 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -3,7 +3,7 @@
     @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ EditWorkId ? '编辑' : '添加' }}作业</div>
+        <div class="headerTitle">{{ edit ? '编辑' : '添加' }}作业</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer" />
       </div>
@@ -62,16 +62,20 @@
           <a-button class="btn2" html-type="submit">确定</a-button>
         </div>
       </a-form>
+      
 
     </div>
+    <!--  加载动画 -->
+    <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
+        <a-spin :spinning="addLoading" tip="添加中..." />
+      </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, ref } from "vue";
+import { reactive, ref, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing } from "@/api/indexWork";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
-import { storage } from "../../api/storage";
 import dayjs from 'dayjs';
 
 const rowSelection = ref({
@@ -127,6 +131,14 @@ export default {
       type: Number,
       default: null,
     },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
     const formState = reactive({
@@ -134,10 +146,10 @@ export default {
       workRequirement: '',
       choosedTime: '',
     });
-    const formRef = ref();
     const state = reactive({
-      routerId: storage.get("routerId") ? JSON.parse(storage.get("routerId")) : null,
+      addLoading: false,
     })
+    const formRef = ref();
 
     let checkWorkName = async (_rule, value) => {
       if (!value) {
@@ -227,18 +239,14 @@ export default {
     };
 
     const updateWork = () => {
-
-      // 如果是关卡页面进入 ---------------------------------
-      if (props.isLevel) {
-        myRouterEditTask()
-      } else { // 任务页面进入------------------------------
+      state.addLoading = true;
         if (props.edit) { // 编辑任务
           myUpdateWorkTaskUsing()
         } else {  // 创建任务
           console.log('创建任务***************');
           myCreateWorkTask()
         }
-      }
+      
     };
 
         // 新增任务
@@ -258,7 +266,13 @@ export default {
             "workTag": ""
           }
           createWorkTask(obj).then((res) => {
-            myProjectEditTask(res.data.data.workId);
+            if(props.isLevel) {
+            // 如果是关卡页面进入 ---------------------------------
+              myRouterEditTask(res.data.data.workId);
+            }else {
+              myProjectEditTask(res.data.data.workId);
+            }
+            
           }).catch((err) => {
             message.error(`添加失败${err}`)
           })
@@ -281,19 +295,26 @@ export default {
           }
           updateWorkTaskUsing(editObj).then((res) => {
           console.log(res);
-          myProjectEditTask(res.data.data.workId)
+          if(props.isLevel) {
+            // 如果是关卡页面进入 ---------------------------------
+              myRouterEditTask(res.data.data.workId);
+            }else {
+              myProjectEditTask(res.data.data.workId);
+            }
         }).catch((err) => {
           message.error(`编辑失败${err}`)
         })
         }
         // 查询任务
         const queryWork = () => {
+          state.addLoading = true;
           queryWorkDetailById({workId:props.EditWorkId}).then((res) => {
             console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
             formState.workName = res.data.data.workName;
             formState.workRequirement = res.data.data.workRequirement;
             formState.choosedTime = [dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"), dayjs(res.data.data.submitEndTime, "YYYY-MM-DD")]
             console.log(res);
+            state.addLoading = false;
           }).catch(() => {
             message.error(`查询失败`)
           })
@@ -306,7 +327,7 @@ export default {
           "flag": true,
           "name": formState.workName,
           "projectId": props.projectId,
-          "projectTaskId":  props.projectTaskId || null,
+          "projectTaskId":  props.projectTaskId || 0,
           "stageId": props.chooseStageId,
           "type": 4
         }
@@ -314,6 +335,7 @@ export default {
           console.log(` 编辑项目成功的打印 ${res}`);
           message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
           ctx.emit("changeData", false);
+          state.addLoading = false;
           closeDrawer();
         }).catch(err => {
           message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
@@ -322,24 +344,26 @@ export default {
 
         }
         // 新增编辑或新增关卡任务
-        const myRouterEditTask = () => {
+        const myRouterEditTask = (testId) => {
           let editObj1 = {
-            "chapterId": 70,
-            "courseId": 0,
-            "duration": 0,
+            "chapterId": props.isactive,
+            "courseId": testId,
+            "duration": 30,
             "flag": true,
             "name": formState.workName,
-            "routerId": Number(storage.get('routerId')),
-            "routerTaskId": 0,
+            "routerId": props.routerId,
+            "routerTaskId":  props.routerTaskId || 0,
             "type": 4
           }
 
           RouterEditTask(editObj1).then(res => {
             console.log(` 编辑关卡成功的打印 ${res}`);
-            message.success(`${props.workId ? '编辑' : '新增'}关卡任务成功`)
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;
             closeDrawer();
           }).catch(err => {
-            message.error(`${props.workId ? '编辑' : '新增'}关卡任务失败`)
+            message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
             console.log(` 编辑关卡失败的打印 ${err}`);
           })
         }
@@ -359,7 +383,7 @@ export default {
       // layout,
       rules,
       updateWork,
-      state,
+      ...toRefs(state)
     };
   },
 };
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index a534386a..a56544a7 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{EditTestId ? "编辑" : "添加" }}考试</div>
+        <div class="headerTitle">{{edit ? "编辑" : "添加" }}考试</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -194,13 +194,17 @@
       </div>
     </a-form>
     </div>
+    <!--  加载动画 -->
+    <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
+        <a-spin :spinning="addLoading" tip="添加中..." />
+      </div>
   </a-drawer>
 </template>
   <script>
-import { reactive, ref } from "vue";
+import { reactive, ref, toRefs } from "vue";
 import {message} from"ant-design-vue";
 import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
-import { ProjectEditTask } from "@/api/indexTask"
+import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"
 
 import  dayjs from 'dayjs';
 const rowSelection = ref({
@@ -232,18 +236,26 @@ export default {
       type: Number,
       default: -1,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
     },
+    routerTaskId: {
+      type: Number,
+      default: null,
+    },
     chooseStageId: {
       type: Number,
       default: null,
     },
-    routerTaskId: {
-      type: Number,
-      default: 0,
-    },
     isLevel: { // 是否是关卡页面触发
       type: Boolean,
       default: null,
@@ -271,6 +283,9 @@ export default {
       showAnswers:2,
       choosedTime:'',
     });
+    const state = reactive({
+      addLoading: false,
+    })
     const formRef = ref();
     let checkExaminationName = async (_rule, value) => {
       if (!value) {
@@ -421,20 +436,22 @@ export default {
       console.log("formState", bool);
     };
     const queryTest = () => {
+      state.addLoading = true;
       console.log(props.EditTestId);
       queryExaminationDetailById({examinationId:props.EditTestId}).then((res) => {
         formState.examinationName = res.data.data.examinationName;
         formState.workRequirement = res.data.data.workRequirement;
         formState.examinationDuration = res.data.data.examinationDuration;
-        formState.examinationLimit = res.data.data.examinationLimit || -1;
+        formState.examinationLimit = Number(res.data.data.examinationLimit) || -1;
         formState.passLine = res.data.data.passLine;
         formState.examinationExplain = res.data.data.examinationExplain;
-        formState.questionArrangement = res.data.data.questionArrangement || 1;
-        formState.scoringModel = res.data.data.scoringModel || 1;
-        formState.showAnalysis = res.data.data.showAnalysis || 1;
-        formState.showAnswers = res.data.data.showAnswers || 1;
+        formState.questionArrangement = Number(res.data.data.questionArrangement) || 1;
+        formState.scoringModel = Number(res.data.data.scoringModel) || 1;
+        formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
+        formState.showAnswers = Number(res.data.data.showAnswers )|| 1;
         if(res.data.data.examinationEndTime && res.data.data.examinationStartTime){
           formState.choosedTime= [dayjs(res.data.data.examinationStartTime,"YYYY-MM-DD"),dayjs(res.data.data.examinationEndTime,"YYYY-MM-DD")]
+          state.addLoading = false;
         } else { formState.choosedTime=[] }
         console.log(res);
       }).catch(() => {
@@ -442,19 +459,12 @@ export default {
       })
     }
     const updateTest = () => {
-
-      // 如果是关卡页面进入 ---------------------------------
-      if (props.isLevel) {
-        //. 
-      } else {  // 从任务界面进入
+      state.addLoading = true;
         if(props.edit) { // 编辑任务
           myUpdateExamination()
         }else { // 创建任务
           myCreateExamination()
         }
-      }
-
-
     }
     
     const myUpdateExamination = () => {
@@ -482,7 +492,12 @@ export default {
       }
       updateExamination(obj).then((res)=>{
         console.log(res);
-        myProjectEditTask(res.data.data.examinationId)
+        // 如果是关卡页面进入 ---------------------------------
+        if(props.isLevel) {
+          myRouterEditTask(res.data.data.examinationId)
+        }else { 
+          myProjectEditTask(res.data.data.examinationId)
+        }
       }).catch(()=>{
         message.error(`编辑失败`)
       })
@@ -512,7 +527,11 @@ export default {
             "updateUser": 0
       }
       createExamination(obj).then((res)=>{
-        myProjectEditTask(res.data.data.examinationId)
+        if(props.isLevel) {
+          myRouterEditTask(res.data.data.examinationId)
+        }else { 
+          myProjectEditTask(res.data.data.examinationId)
+        }
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
@@ -533,6 +552,7 @@ export default {
         console.log(` 编辑项目成功的打印 ${res}`);
         message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
         ctx.emit("changeData", false);
+        state.addLoading = false;
         closeDrawer();
       }).catch(err => {
         message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
@@ -540,6 +560,30 @@ export default {
       })
     }
 
+    const myRouterEditTask = (testId) => {
+      let editObj1 = {
+            "chapterId": props.isactive,
+            "courseId": testId,
+            "duration": 30,
+            "flag": true,
+            "name": formState.examinationName,
+            "routerId": props.routerId,
+            "routerTaskId":  props.routerTaskId || 0,
+            "type": 5
+          }
+
+          RouterEditTask(editObj1).then(res => {
+            console.log(` 编辑关卡成功的打印 ${res}`);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;
+            closeDrawer();
+          }).catch(err => {
+            message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
+            console.log(` 编辑关卡失败的打印 ${err}`);
+          })
+    }
+
     const cloradio1 = (value) => {
       if (value != "") {
         formState.showAnswers = "";
@@ -579,6 +623,7 @@ export default {
       rules,
       updateTest,
       queryTest,
+      ...toRefs(state)
     };
   },
 };
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index e491e9d3..7299f769 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -208,9 +208,15 @@
           <!-- 添加作业侧弹窗 -->
           <div>
             <add-homework
-              flag="0"
-              :workId="editID"
-              v-model:addhomeworkVisible="addhomeworkvisible"
+            v-model:addhomeworkVisible="addhomeworkvisible"
+            :isLevel=true
+            @changeData="updateTableData"
+            v-model:isactive="isactive"
+            v-model:edit="edit"
+            v-model:routerId="routerId"
+            v-model:chooseStageId="chooseStageId"
+            v-model:EditWorkId="EditWorkId"
+            v-model:routerTaskId="routerTaskId"
             />
           </div>
           <div class="lin"></div>
@@ -225,10 +231,15 @@
           <!-- 添加考试侧弹窗 -->
           <div>
             <add-test
-              :workId="editID"
-              @clearEditData="clearEditData"
               v-model:addtestVisible="addtestvisible"
-            />
+              :isLevel=true
+              @changeData="updateTableData"
+              v-model:isactive="isactive"
+              v-model:edit="edit"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:EditTestId="EditTestId"
+              v-model:routerTaskId="routerTaskId"            />
           </div>
           <div class="lin"></div>
         </div>
@@ -501,7 +512,7 @@
                             margin-right: 25px;
                             cursor: pointer;
                           "
-                          @click="decideType(element.lei, element.courseId)"
+                          @click="decideType(element.lei, element.courseId,element.id)"
                         >
                           编辑
                         </span>
@@ -1058,6 +1069,10 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
+      EditWorkId:"", // 要编辑的 workid 
+      EditTestId: "",
+      routerTaskId:"",
+      stageId:"",
       isStudy: 1,
       cC: false,
       value1: "",
@@ -1138,13 +1153,15 @@ export default {
       state.visible = true;
     };
     // 作业和考试的抽屉
-    const showDrawerAddHomework = () => {
+    const showDrawerAddHomework = (id, eleId) => {
       state.addhomeworkvisible = true;
-      state.ListChoosedId = 0;
+      state.EditWorkId = id;
+      state.routerTaskId = eleId;
     };
-    const showDrawerAddTest = () => {
+    const showDrawerAddTest = (id,eleId) => {
       state.addtestvisible = true;
-      state.ListChoosedId = 0;
+      state.EditTestId = id;
+      state.routerTaskId = eleId;
     };
     //测试评估投票抽屉
     const showDrawerAddEval = () => {
@@ -1183,12 +1200,16 @@ export default {
         }
       }
     };
-    const getDetail = (index) => {
+    //数据变化
+    const updateTableData = (data) => {
+      console.log("添加数据", data);
+      getDetail();
+    };
+    const getDetail = () => {
       GetRouterDetail(state.routerId)
         .then((res) => {
           state.level = res.data.data.chapterList;
-          console.log(state.level);
-          if (index == 0 && state.level.length > 0) {
+         if (state.level.length > 0) {
             dataAssignment(state.level[0].chapterId);
             state.isactive = state.level[0].chapterId;
           }
@@ -1535,7 +1556,7 @@ export default {
       document.getElementsByTagName("main")[0].style.background =
         "rgb(245, 247, 250,1)";
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
-      getDetail(0);
+      getDetail();
     });
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1569,17 +1590,15 @@ export default {
       state.editID = "";
     };
     const deleteLevelTask = () => {
-      deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>
-        console.log("删除成功", res)
-      );
-      // RouterDeleteTask(state.listChoosedId)
-      //   .then((res) => {
-      //     console.log(`删除成功${res}`);
-      //     message.success("删除成功");
-      //   })
-      //   .catch((err) => {
-      //     console.log(`删除失败${err}`);
-      //   });
+      deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>{
+      state.deleteModal = false
+      message.success('删除成功')
+      getDetail();
+      console.log("删除成功", res)
+      }).catch((err) =>{
+        message.error('删除失败');
+        console.log(err);
+      })
     };
 
     const showDrawerAddLive = () => {
@@ -1596,7 +1615,7 @@ export default {
     // 子组件触发的清空 editid 事件
     const clearEditData = () => {
       state.editID = "";
-      getDetail(0);
+      getDetail();
     };
 
     //选择单个任务
@@ -1665,6 +1684,7 @@ export default {
             console.log(res);
             message.destroy();
             message.success("批量删除成功");
+            getDetail();
           })
           .catch((err) => {
             console.log(err);
@@ -1701,12 +1721,17 @@ export default {
       state.EditLiveId = id;
     };
     //编辑的按钮
-    const decideType = (type, id) => {
+    const decideType = (type, id, eleId) => {
+      state.edit = true;
       console.log(type, id);
       if (type == "外链") {
         showEditRefDrawer(id);
       } else if (type == "直播") {
         showEditLiveDrawer(id);
+      }else if (type == "作业") {
+        showDrawerAddHomework(id,eleId);
+      }else if (type == "考试") {
+        showDrawerAddTest(id,eleId);
       }
     };
     return {
@@ -1750,6 +1775,7 @@ export default {
       showEditRefDrawer,
       showEditLiveDrawer,
       decideType,
+      updateTableData,
     };
   },
 };

From 7317520f103ed20a804b95b0c5d7a27153d6bda7 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Tue, 8 Nov 2022 17:03:27 +0800
Subject: [PATCH 04/90] =?UTF-8?q?feat=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=20=E6=90=9C=E7=B4=A2=20=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=20=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E5=88=A0=E9=99=A4=20=E6=B8=85=E7=A9=BA=20=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js                   |   7 +
 src/components/drawers/AddHomework.vue    | 402 ++++++++++++----------
 src/components/drawers/AddRef.vue         |  14 +-
 src/views/learningpath/LevelAddDetail.vue |  17 +-
 src/views/projectcenter/TaskAdd.vue       |   2 +
 src/views/projectcenter/TaskPage.vue      | 382 +++++++++++++++-----
 6 files changed, 541 insertions(+), 283 deletions(-)
 create mode 100644 src/api/indexProjStu.js

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
new file mode 100644
index 00000000..0dc883a6
--- /dev/null
+++ b/src/api/indexProjStu.js
@@ -0,0 +1,7 @@
+import http from "./config";
+
+//获取项目学员列表
+export const getProjStu = (obj) => http.post('/admin/project/studentList', obj)
+
+//删除学员
+export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)
\ No newline at end of file
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 62c2bbb3..5f34ba4e 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{workId ? '编辑':'添加' }}作业</div>
+        <div class="headerTitle">{{ workId ? "编辑" : "添加" }}作业</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -16,99 +16,103 @@
         />
       </div>
       <a-form
-            ref="formRef"
-            name="custom-validation"
-            :model="formState"
-            :rules="rules"
-            v-bind="layout"
-            @finish="handleFinish"
-            @validate="handleValidate"
-            @finishFailed="handleFinishFailed"
-          >
-      <div class="contentMain">
-        <div class="main_left">
-          
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="作业名称" name="workName">
-                <a-input v-model:value="formState.workName"
-                style="width: 424px; height: 32px;margin-left: 35px;"
-                placeholder="请输入作业名称"
-                autocomplete="off" />
-              </a-form-item>
-             
-            </div>
-          </div>
-          <div class="main_item2">
-              <a-form-item has-feedback label="作业要求" name="workRequirement">
-              <a-textarea
-                v-model:value="formState.workRequirement"
-                placeholder="请输入作业要求"
-                autocomplete="off"
-                allow-clear
-                style="margin-left: 35px"
-                maxlength="150"
-              />
-              </a-form-item>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="提交时间" name="choosedTime">
-              <a-range-picker
-              style="width: 424px;margin-left: 35px;"
-              v-model:value="formState.choosedTime"
-              format="YYYY-MM-DD"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
-            </a-form-item>
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/enclosure.png"
-                  alt=""
-                />
+        ref="formRef"
+        name="custom-validation"
+        :model="formState"
+        :rules="rules"
+        v-bind="layout"
+        @finish="handleFinish"
+        @validate="handleValidate"
+        @finishFailed="handleFinishFailed"
+      >
+        <div class="contentMain">
+          <div class="main_left">
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="作业名称" name="workName">
+                  <a-input
+                    v-model:value="formState.workName"
+                    style="width: 424px; height: 32px; margin-left: 35px"
+                    placeholder="请输入作业名称"
+                    autocomplete="off"
+                  />
+                </a-form-item>
               </div>
-              <span style="margin-right: 3px">附件：</span>
             </div>
-            <div class="btnbox">
-              <a-upload
-                v-model:file-list="fileList"
-                name="file"
-                action="/api/file/upload"
-                @change="handleChange"
-              >
-              <button class="xkbtn" type="button">上传附件</button>
-            </a-upload>
+            <div class="main_item2">
+              <a-form-item has-feedback label="作业要求" name="workRequirement">
+                <a-textarea
+                  v-model:value="formState.workRequirement"
+                  placeholder="请输入作业要求"
+                  autocomplete="off"
+                  allow-clear
+                  style="margin-left: 35px"
+                  maxlength="150"
+                />
+              </a-form-item>
             </div>
-          </div>
-          <div class="main_item" style="margin-top:-25px;">
-            <div class="signbox">
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="提交时间" name="choosedTime">
+                  <a-range-picker
+                    style="width: 424px; margin-left: 35px"
+                    v-model:value="formState.choosedTime"
+                    format="YYYY-MM-DD"
+                    :placeholder="['      开始时间', '        结束时间']"
+                  />
+                </a-form-item>
+              </div>
             </div>
-            <div class="btnbox">
-              <span style="color:#999999;">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
+            <div class="main_item">
+              <div class="signbox">
+                <div class="sign">
+                  <img
+                    src="@/assets/images/coursewareManage/enclosure.png"
+                    alt=""
+                  />
+                </div>
+                <span style="margin-right: 3px">附件：</span>
+              </div>
+              <div class="btnbox">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <button class="xkbtn" type="button">上传附件</button>
+                </a-upload>
+              </div>
+            </div>
+            <div class="main_item" style="margin-top: -25px">
+              <div class="signbox"></div>
+              <div class="btnbox">
+                <span style="color: #999999"
+                  >支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
+                >
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="main_btns">
-        <a-button class="btn1"  @click="closeDrawer">取消</a-button>
-        <a-button class="btn2" html-type="submit">确定</a-button>
-      </div>
-    </a-form>
-
+        <div class="main_btns">
+          <a-button class="btn1" @click="closeDrawer">取消</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button>
+        </div>
+      </a-form>
     </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, ref } from "vue";
-import {message} from"ant-design-vue";
-import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing} from "@/api/indexWork";
-import { ProjectEditTask,RouterEditTask } from "@/api/indexTask";
+import { message } from "ant-design-vue";
+import {
+  createWorkTask,
+  queryWorkDetailById,
+  updateWorkTaskUsing,
+} from "@/api/indexWork";
+import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import { storage } from "../../api/storage";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 const rowSelection = ref({
   checkStrictly: false,
@@ -146,53 +150,65 @@ export default {
     routerTaskId: {
       type: Number,
       default: 0,
-    }
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const formState = reactive({
-      workName: '',
-      workRequirement: '',
-      choosedTime: '',
+      workName: "",
+      workRequirement: "",
+      choosedTime: "",
     });
     const formRef = ref();
     const state = reactive({
-      routerId: storage.get("routerId") ?JSON.parse(storage.get("routerId"))  : null,
-    })
+      routerId: storage.get("routerId")
+        ? JSON.parse(storage.get("routerId"))
+        : null,
+    });
 
     let checkWorkName = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
 
     let checkWorkRequirement = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业要求');
+        return Promise.reject("请输入作业要求");
       }
     };
 
     let checkTime = async (_rule, value) => {
       if (!value.length) {
-        return Promise.reject('请选择时间');
+        return Promise.reject("请选择时间");
       }
     };
 
     const rules = {
-      workName: [{
-        required: true,
-        validator: checkWorkName,
-        trigger: 'change',
-      }],
-      workRequirement: [{
-        required: true,
-        validator: checkWorkRequirement,
-        trigger: 'change',
-      }],
-      choosedTime: [{
-        required: true,
-        validator: checkTime,
-        trigger: 'change',
-      }],
+      workName: [
+        {
+          required: true,
+          validator: checkWorkName,
+          trigger: "change",
+        },
+      ],
+      workRequirement: [
+        {
+          required: true,
+          validator: checkWorkRequirement,
+          trigger: "change",
+        },
+      ],
+      choosedTime: [
+        {
+          required: true,
+          validator: checkTime,
+          trigger: "change",
+        },
+      ],
     };
     // const layout = {
     //   labelCol: {
@@ -202,12 +218,12 @@ export default {
     //     span: 14,
     //   },
     // };
-    const handleFinish = values => {
+    const handleFinish = (values) => {
       console.log(values);
-      updateWork(props.workId)
+      updateWork(props.workId);
     };
 
-    const handleFinishFailed = errors => {
+    const handleFinishFailed = (errors) => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
@@ -219,14 +235,14 @@ export default {
     const handleValidate = (...args) => {
       console.log(args);
     };
-    const handleChange = info => {
-      if (info.file.status !== 'uploading') {
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
         console.log(info.file, info.fileList);
       }
 
-      if (info.file.status === 'done') {
+      if (info.file.status === "done") {
         message.success(`${info.file.name} 文件上传成功`);
-      } else if (info.file.status === 'error') {
+      } else if (info.file.status === "error") {
         message.error(`${info.file.name} 文件上传失败.`);
       }
     };
@@ -235,98 +251,110 @@ export default {
     const closeDrawer = () => {
       resetForm();
       fileList.value = [];
-      formState.choosedTime = '';
+      formState.choosedTime = "";
       ctx.emit("update:addhomeworkVisible", false);
     };
     const afterVisibleChange = (bool) => {
-      if(props.addhomeworkVisible && props.workId){
-        queryWork({workId: props.workId})
+      if (props.addhomeworkVisible && props.workId) {
+        queryWork({ workId: props.workId });
       }
       console.log("state", bool);
     };
     const queryWork = (data) => {
-      queryWorkDetailById(data).then((res) => {
-        console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
-        formState.workName = res.data.data.workName;
-        formState.workRequirement = res.data.data.workRequirement;
-        formState.choosedTime=[dayjs(res.data.data.submitStartTime,"YYYY-MM-DD"),dayjs(res.data.data.submitEndTime,"YYYY-MM-DD")]
-        console.log(res);
-      }).catch(() => {
-        message.error(`查询失败`)
-      })
+      queryWorkDetailById(data)
+        .then((res) => {
+          console.log(
+            dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD")
+          );
+          formState.workName = res.data.data.workName;
+          formState.workRequirement = res.data.data.workRequirement;
+          formState.choosedTime = [
+            dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.submitEndTime, "YYYY-MM-DD"),
+          ];
+          console.log(res);
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
     };
     const updateWork = (id) => {
       let obj = {
-        "createTime": "",
-        "createUser": 0,
-        "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-        "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        "updateTime": "",
-        "updateUser": 0,
-        "workEnclosureAddress": "",
-        "workFlag": "",
-        "workId": id || 0,
-        "workName": formState.workName,
-        "workRequirement": formState.workRequirement,
-        "workTag": ""
-      }
-      if(id) {
-        updateWorkTaskUsing(obj).then((res) => {
-        console.log(res);
-      }).catch((err) => {
-        message.error(`编辑失败${err}`)
-      })
+        createTime: "",
+        createUser: 0,
+        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+        updateTime: "",
+        updateUser: 0,
+        workEnclosureAddress: "",
+        workFlag: "",
+        workId: id || 0,
+        workName: formState.workName,
+        workRequirement: formState.workRequirement,
+        workTag: "",
+      };
+      if (id) {
+        updateWorkTaskUsing(obj)
+          .then((res) => {
+            console.log(res);
+          })
+          .catch((err) => {
+            message.error(`编辑失败${err}`);
+          });
       } else {
-        createWorkTask(obj).then((res)=>{
-          console.log(res);
-      }).catch((err)=>{
-        message.error(`添加失败${err}`)
-      })
+        createWorkTask(obj)
+          .then((res) => {
+            console.log(res);
+          })
+          .catch((err) => {
+            message.error(`添加失败${err}`);
+          });
       }
-      if(props.flag == 1) {
+      if (props.flag == 1) {
         let editObj = {
-        "courseId": 0,
-        "duration": 0,
-        "flag": true,
-        "name": formState.workName,
-        "projectId": 0,
-        "projectTaskId": props.workId || '',
-        "stageId": 0,
-        "type": 4
-      }
-      // 新增编辑或新增项目任务
-      ProjectEditTask(editObj).then(res => {
-        console.log(` 编辑项目成功的打印 ${res}`);
-        message.success(`${props.workId? '编辑' : '新增'}阶段任务成功`)
-        closeDrawer();
-      }).catch(err => {
-        message.error(`${props.workId? '编辑' : '新增'}阶段任务失败`)
-        console.log(` 编辑项目失败的打印 ${err}`);
-      })
+          courseId: 0,
+          duration: 0,
+          flag: true,
+          name: formState.workName,
+          projectId: 0,
+          projectTaskId: props.workId || "",
+          stageId: 0,
+          type: 4,
+        };
+        // 新增编辑或新增项目任务
+        ProjectEditTask(editObj)
+          .then((res) => {
+            console.log(` 编辑项目成功的打印 ${res}`);
+            message.success(`${props.workId ? "编辑" : "新增"}阶段任务成功`);
+            closeDrawer();
+          })
+          .catch((err) => {
+            message.error(`${props.workId ? "编辑" : "新增"}阶段任务失败`);
+            console.log(` 编辑项目失败的打印 ${err}`);
+          });
       } else {
         let editObj1 = {
-          "chapterId":36,
-          "courseId": 0,
-          "duration": 0,
-          "flag": true,
-          "name": formState.workName,
-          "routerId": Number(storage.get('routerId')),
-          "routerTaskId": '',
-          "type": 4
-        }
+          chapterId: props.isactive,
+          courseId: 0,
+          duration: 0,
+          flag: true,
+          name: formState.workName,
+          routerId: Number(storage.get("routerId")),
+          routerTaskId: "",
+          type: 4,
+        };
         // 新增编辑或新增关卡任务
-      RouterEditTask(editObj1).then(res => {
-        console.log(` 编辑关卡成功的打印 ${res}`);
-        message.success(`${props.workId? '编辑' : '新增'}关卡任务成功`)
-        closeDrawer();
-      }).catch(err => {
-        message.error(`${props.workId? '编辑' : '新增'}关卡任务失败`)
-        console.log(` 编辑关卡失败的打印 ${err}`);
-      })
+        RouterEditTask(editObj1)
+          .then((res) => {
+            console.log(` 编辑关卡成功的打印 ${res}`);
+            message.success(`${props.workId ? "编辑" : "新增"}关卡任务成功`);
+            closeDrawer();
+          })
+          .catch((err) => {
+            message.error(`${props.workId ? "编辑" : "新增"}关卡任务失败`);
+            console.log(` 编辑关卡失败的打印 ${err}`);
+          });
       }
-      
-      
-
     };
     return {
       afterVisibleChange,
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 5e24516f..65a73547 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -126,6 +126,14 @@ export default {
       type: Number,
       default: null,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -183,12 +191,12 @@ export default {
             //学习路径的创建
             if (props.isStudy == 1) {
               let objj = {
-                chapterId: 36,
-                courseId: 0,
+                chapterId: props.isactive,
+                courseId: res.data.data.linkId,
                 duration: 0,
                 flag: true,
                 name: obj.linkName,
-                routerId: 92,
+                routerId: props.routerId,
                 routerTaskId: 0,
                 type: 7,
               };
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 413f60a7..688ff4e2 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -211,6 +211,7 @@
               flag="0"
               :workId="editID"
               v-model:addhomeworkVisible="addhomeworkvisible"
+              v-model:isactive="isactive"
             />
           </div>
           <div class="lin"></div>
@@ -517,22 +518,6 @@
                 </div>
               </template>
             </draggable>
-
-            <!-- <a-table
-              style="border: 1px solid #f2f6fe"
-              :columns="tableDataFunc()"
-              :data-source="tableData"
-              :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-              @expand="expandTable"
-              :customRow="handleClickRow"
-              :pagination="false"
-              :row-selection="{
-                columnWidth: 30,
-                selectedRowKeys: selectedRowKeys,
-                onChange: onSelectChange,
-              }"
-            /> -->
           </div>
           <!-- 无数据样式 -->
           <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 3e8d5d35..f675c128 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -847,6 +847,7 @@ export default {
         ? JSON.parse(storage.get("projectId"))
         : null,
       chooseStageId: null,
+      edit: false,
       isRefEdit: 1, //外链编辑
       isLiveEdit: 1, //直播编辑
       EditRefId: null, //要编辑的外链的id
@@ -1885,6 +1886,7 @@ export default {
     };
     //编辑的按钮
     const decideType = (type, id) => {
+      state.edit = true;
       console.log(type, id);
       if (type == "外链") {
         showEditRefDrawer(id);
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 42a53158..574436af 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -478,7 +478,7 @@
                     >
                       <div class="groupname">小组名称：</div>
                       <a-input
-                        v-model:value="valuestug"
+                        v-model:value="valuestugroup"
                         placeholder="请输入小组名称"
                       />
                     </div>
@@ -494,6 +494,8 @@
                       <a-select
                         v-model:value="valuestub"
                         placeholder="请选择部门"
+                        :options="bum"
+                        @change="handleChangeBum"
                       />
                     </div>
                     <div
@@ -508,15 +510,16 @@
                         v-model:value="valuegood"
                         placeholder="是否为优秀学员"
                         :options="goodstuList"
+                        @change="handleChangeGood"
                       />
                     </div>
                   </div>
                   <div class="groupright">
-                    <div class="btn1">
+                    <div class="btn1" @click="searchStu">
                       <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
-                    <div class="btn2">
+                    <div class="btn2" @click="resetCancel">
                       <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
@@ -531,7 +534,7 @@
                     <img src="../../assets/images/courseManage/reset2.png" />
                     <span class="btn2text">导入学员</span>
                   </div>
-                  <div class="btn2">
+                  <div class="btn2" @click="showAllDelete">
                     <img src="../../assets/images/projectadd/delete.png" />
                     <span class="btn2text">批量删除</span>
                   </div>
@@ -541,14 +544,14 @@
                   <div class="xu">
                     <span class="yi">已选择</span>
                     <div style="width: 5px; display: inline-block"></div>
-                    <span class="th">2</span>
+                    <span class="th">{{ choosed }}</span>
                     <div style="width: 5px; display: inline-block"></div>
                     <span class="yi">项</span>
                     <span class="zon">列表选项总计：</span>
-                    <span class="yi">4</span>
+                    <span class="yi">{{ total }}</span>
                     <span class="yi">条</span>
                   </div>
-                  <div class="clear">清空</div>
+                  <div class="clear" @click="clearChooseStu">清空</div>
                 </div>
                 <div class="tab" style="margin: 20px 32px 30px 32px">
                   <a-table
@@ -1271,7 +1274,7 @@
     <!-- 删除学员弹窗 -->
     <div>
       <a-modal
-        v-model:visible="canclestu2"
+        v-model:visible="deleteOneStu"
         :footer="null"
         :closable="close"
         wrapClassName="canclestu1"
@@ -1289,10 +1292,10 @@
             </div>
             <div class="del_btnbox">
               <div class="del_btn btn1">
-                <div class="btnText" @click="closeModal4">取消</div>
+                <div class="btnText" @click="closeDeleteOne">取消</div>
               </div>
               <div class="del_btn btn2">
-                <div class="btnText" @click="closeModal4">确定</div>
+                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
               </div>
             </div>
           </div>
@@ -1644,10 +1647,41 @@
         </div>
       </div>
     </a-modal>
+    <!-- 批量删除弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="allDelete"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span>您确定批量删除吗？</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="closeCancelDelete">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="closeAllDelete">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
   </div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, onMounted } from "vue";
 import { useRoute } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
@@ -1667,6 +1701,8 @@ import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
+import { getProjStu, deleteStu } from "../../api/indexProjStu";
+import { message } from "ant-design-vue";
 export default {
   name: "taskPage",
   components: {
@@ -1689,7 +1725,9 @@ export default {
   },
   setup() {
     const state = reactive({
-      projectId: storage.get("projectId") ?JSON.parse(storage.get("projectId")) : null,
+      projectId: storage.get("projectId")
+        ? JSON.parse(storage.get("projectId"))
+        : null,
       goodstuList: [
         {
           id: 1,
@@ -1707,57 +1745,64 @@ export default {
           label: "优秀学员",
         },
       ],
+      bum: [
+        {
+          id: 1,
+          value: "",
+          label: "",
+        },
+      ],
+      //学员信息列表
       tabledata: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          gangw: "产品经理",
-          group: "好好学习",
-          progress: "5/20",
+          name: "sss",
+          bum: "c",
+          gangw: "ss",
+          group: "sss",
+          progress: "sss",
           diploma: "0",
-          stutime: "2022-10-31 23:12:00",
-          putin: "手动加入",
-          excellent: true, //是否是优秀学员
+          stutime: "20202",
+          putin: "shs",
+          excellent: true,
+          studentId: 22,
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          gangw: "产品经理",
-          group: "天天向上",
-          progress: "5/20",
+          name: "sss",
+          bum: "c",
+          gangw: "ss",
+          group: "sss",
+          progress: "sss",
           diploma: "0",
-          stutime: "2022-10-21 23:12:00",
-          putin: "手动加入",
-          excellent: false, //是否是优秀学员
+          stutime: "20202",
+          putin: "shs",
+          excellent: true,
+          studentId: 23,
         },
         {
           key: 3,
-          name: "小王",
-          bum: "产研部",
-          gangw: "后端",
-          group: "好好学习",
-          progress: "5/20",
+          name: "sss",
+          bum: "c",
+          gangw: "ss",
+          group: "sss",
+          progress: "sss",
           diploma: "0",
-          stutime: "2022-10-11 23:12:00",
-          putin: "手动加入",
-          excellent: false, //是否是优秀学员
-        },
-        {
-          key: 4,
-          name: "小赵",
-          bum: "产研部",
-          gangw: "前端",
-          group: "天天向上",
-          progress: "5/20",
-          diploma: "0",
-          stutime: "2022-10-31 23:12:00",
-          putin: "手动加入",
-          excellent: true, //是否是优秀学员
+          stutime: "20202",
+          putin: "shs",
+          excellent: false,
+          studentId: 24,
         },
       ],
-
+      // stuName: "", //搜索的学员姓名
+      // stuGroup: "", //搜索的学员小组名称
+      // stuBum: "", //搜索的学员小组部门
+      // stuGood: "", //搜索的学员是否优秀
+      total: null, //学员列表数据总条数
+      choosed: 0, //勾选的学员总数
+      selectedRowKeys: [], //选择的学员
+      selectedRows: [], //选择的学员的id值
+      chooseDeleteOne: [], //删除的单个学员id
       //进度排行学员
       rankjindu: [{ value: "学员", label: "学员" }],
       valuestu1: "学员",
@@ -1789,12 +1834,12 @@ export default {
       zhibModal: false, //直播二维码弹窗
 
       huodModal: false, //活动二维码弹窗
-
+      allDelete: false, //批量删除弹窗
       pubproject: false,
       stugroup: false,
       canclestu: false,
       canclestu1: false,
-      canclestu2: false,
+      deleteOneStu: false, //删除单个学员弹窗
       checked: false,
       checked1: true,
       checked2: false,
@@ -1813,8 +1858,8 @@ export default {
       valuestun: "", //学员管理姓名
       valuegood: "",
       valuestub: "", //学员管理部门
-      valuestug: "", //学员管理小组名称
-
+      valuestug: "", //学员小组管理名称
+      valuestugroup: "", //学员管理小组名称
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2382,12 +2427,7 @@ export default {
     const closeModal3 = () => {
       state.canclestu1 = false;
     };
-    const showModal4 = () => {
-      state.canclestu2 = true;
-    };
-    const closeModal4 = () => {
-      state.canclestu2 = false;
-    };
+
     const showModal2 = () => {
       state.stugroup = true;
     };
@@ -2544,8 +2584,8 @@ export default {
                 <a-select-option value="删除" label="删除">
                   <div
                     onClick={() => {
-                      console.log("点击了111");
-                      state.canclestu2 = true;
+                      console.log("点击了111", value.studentId);
+                      showDeleteOne(value.studentId);
                     }}
                   >
                     删除
@@ -2676,24 +2716,19 @@ export default {
 
     //tabs切换
     const tabsChange = (e) => {
-     
       //排行榜
       if (e == 6) {
         //获取进度榜
-      getbillboard(1, 1);
-      //获取学分榜
-      getbillboard(2, 1);
-      //获取学时榜
-      getbillboard(3, 1);
+        getbillboard(1, 1);
+        //获取学分榜
+        getbillboard(2, 1);
+        //获取学时榜
+        getbillboard(3, 1);
       } else {
         rankReset();
       }
     };
 
-    
-
-
-
     // start -------排行榜---------------排行榜------------排行榜------------------排行榜---------
     //选择搜索时间
     const rankTimeChange = (e, date) => {
@@ -2743,8 +2778,191 @@ export default {
 
     // end -----排行榜----------------排行榜----------------------排行榜-----------排行榜----------
 
-
-
+    //start---------学员------
+    //删除单个学员
+    const showDeleteOne = (id) => {
+      state.deleteOneStu = true;
+      state.chooseDeleteOne.push(id);
+    };
+    //点击取消删除单个学员
+    const closeDeleteOne = () => {
+      state.deleteOneStu = false;
+    };
+    //点击确认删除单个学员
+    const closeDeleteOneConfirm = () => {
+      state.deleteOneStu = false;
+      deleteStu({
+        projectId: state.projectId,
+        studentIds: state.chooseDeleteOne,
+      })
+        .then((res) => {
+          console.log(res, "单个删除成功");
+          message.success("删除成功");
+        })
+        .catch((err) => {
+          console.log(err, "单个删除失败");
+          message.warning("删除失败");
+        });
+      state.chooseDeleteOne = [];
+    };
+    //批量删除学员弹窗
+    const showAllDelete = () => {
+      if (state.selectedRows.length == 0) {
+        message.destroy();
+        return message.warning("请选择要删除的学员");
+      } else {
+        state.allDelete = true;
+      }
+    };
+    //点击取消的批量删除弹窗
+    const closeCancelDelete = () => {
+      state.allDelete = false;
+    };
+    //点击确定的批量删除弹窗
+    const closeAllDelete = () => {
+      deleteStu({
+        projectId: state.projectId,
+        studentIds: state.selectedRows,
+      })
+        .then((res) => {
+          console.log(res, "删除成功");
+          message.success("删除成功");
+        })
+        .catch((err) => {
+          console.log(err, "删除失败");
+          message.warning("删除成功");
+        });
+      state.allDelete = false;
+    };
+    const handleChangeGood = (value) => {
+      console.log(value, state.valuegood, 11111);
+    };
+    const handleChangeBum = (value) => {
+      console.log(value, 22222);
+    };
+    //把数据放到state里
+    const getTableDataList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          projectId: value.projectId, //项目id
+          groupId: value.groupId, //小组id
+          group: value.groupName, //小组名
+          studentId: value.studentId, //学生id
+          currentStageId: value.currentStageId, //当前关卡id
+          name: value.userInfoBo.userName, //用户名
+          bum: value.userInfoBo.deptName, //部门
+          gangw: value.userInfoBo.jobName, //岗位
+          completeStageCnt: value.userInfoBo.completeStageCnt, //当前完成阶段数
+          totalStageCnt: value.userInfoBo.totalStageCnt, //总阶段数
+          excellent: value.topFlag == 1 ? "0" : "1", //是否优秀学员
+          progress:
+            value.userInfoBo.completeStageCnt +
+            "/" +
+            value.userInfoBo.totalStageCnt,
+          putin:
+            value.source == 0
+              ? "报名加入"
+              : value.source == 1
+              ? "指定添加"
+              : value.source == 2
+              ? "组织添加"
+              : value.source == 3
+              ? "受众添加"
+              : "-", //加入方式
+          beginStudyTime: value.beginStudyTime, //开始学习时间
+        };
+        array.push(obj);
+      });
+      state.tabledata = array;
+    };
+    //学员搜索
+    const searchStu = () => {
+      let obj = {
+        deptIds: [], //部门
+        groupName: state.valuestugroup,
+        name: state.valuestun,
+        pageNo: 0,
+        pageSize: 0,
+        projectId: state.projectId,
+        topFlag:
+          state.valuegood == "优秀学员"
+            ? 1
+            : state.valuegood == "普通学员"
+            ? 0
+            : null,
+      };
+      getProjStu(obj).then((res) => {
+        console.log("搜索成功", res);
+        //重新获取列表
+        let leng = res.data.data.rows;
+        if (leng > 0) {
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+        }
+      });
+    };
+    //勾选学员
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+      state.choosed = state.selectedRowKeys.length;
+      console.log("ssss", selectedRows);
+      state.selectedRows = [];
+      console.log("before", state.selectedRows);
+      // let arr = [];
+      //遍历 插入到state.selectedRows里
+      selectedRows.map((item) => {
+        console.log(item.studentId);
+        state.selectedRows.push(item.studentId);
+        // arr.push(item.studentId);
+        // console.log("asdfasdf", arr);
+      });
+      // state.selectedRows = arr;
+      console.log("after", state.selectedRows);
+      // console.log(state.selectedRows[0]);
+      // console.log("dddd",selectedRows.)
+      //判断是否为数组
+      console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
+    };
+    //清空所选的学员
+    const clearChooseStu = () => {
+      state.selectedRowKeys = [];
+      state.choosed = 0;
+    };
+    //学员重置
+    const resetCancel = () => {
+      (state.valuestun = null),
+        (state.valuestugroup = null),
+        (state.valuestub = null),
+        (state.valuegood = null);
+    };
+    //获取学员列表
+    const getStu = () => {
+      let obj = {
+        deptIds: [], //部门
+        groupName: "",
+        name: "",
+        pageNo: 1,
+        pageSize: 1,
+        projectId: state.projectId,
+        topFlag: 0,
+      };
+      getProjStu(obj).then((res) => {
+        console.log(res.data.data.rows, "获取学员列表");
+        let leng = res.data.data.rows;
+        state.total = res.data.data.total;
+        if (leng > 0) {
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+        }
+      });
+    };
+    //end---------学员------
+    onMounted(() => {
+      getStu();
+    });
     return {
       ...toRefs(state),
       totask,
@@ -2757,8 +2975,8 @@ export default {
       closeModal2,
       showModal3,
       closeModal3,
-      showModal4,
-      closeModal4,
+      showDeleteOne,
+      closeDeleteOne,
       showCopyModal,
       closeCopyModal,
       showTime,
@@ -2789,12 +3007,22 @@ export default {
 
       tabsChange,
 
-     
-
       rankTimeChange,
       getbillboard,
       rankSearch,
       rankReset,
+      handleChangeGood,
+      getStu,
+      getTableDataList,
+      searchStu,
+      handleChangeBum,
+      resetCancel,
+      showAllDelete,
+      closeAllDelete,
+      onSelectChange,
+      closeCancelDelete,
+      clearChooseStu,
+      closeDeleteOneConfirm,
     };
   },
 };

From 604f1d7fb7106081f623d2c1f0ee75b7e252f1e2 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 8 Nov 2022 17:05:12 +0800
Subject: [PATCH 05/90] =?UTF-8?q?=E5=A4=96=E9=93=BE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddRef.vue   | 2 +-
 src/views/projectcenter/TaskAdd.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 28e78e79..985457da 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -174,7 +174,7 @@ export default {
     };
     const handleFinish = values => {
       console.log(values);
-      updateRef(props.workId)
+      updateRef(props.EditRefId)
     };
     const handleFinishFailed = errors => {
       console.log(errors);
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index af9b07db..86b26781 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1882,10 +1882,11 @@ export default {
       console.log("任务id", id);
     };
     //打开编辑外链的弹窗
-    const showEditRefDrawer = (id) => {
+    const showEditRefDrawer = (id,eleId) => {
       state.addrefvisible = true;
       state.isRefEdit = true;
       state.EditRefId = id;
+      state.projectTaskId = eleId;
     };
     //打开编辑直播的弹窗
     const showEditLiveDrawer = (id) => {
@@ -1906,7 +1907,7 @@ export default {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id);
+        showEditRefDrawer(id,eleId);
       } 
       else if (type == "直播") {
         showEditLiveDrawer(id,eleId);

From 233d6853891f8f18793560f74d36ec13a883814c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 8 Nov 2022 19:24:06 +0800
Subject: [PATCH 06/90] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8=E7=9A=84=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexActivity.js              |  3 +
 src/components/drawers/AddActive.vue  | 95 +++++++++++++++++++++++----
 src/components/drawers/AddDiscuss.vue | 11 +++-
 src/views/projectcenter/TaskAdd.vue   |  4 ++
 4 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/src/api/indexActivity.js b/src/api/indexActivity.js
index c7fac455..8adaca20 100644
--- a/src/api/indexActivity.js
+++ b/src/api/indexActivity.js
@@ -12,6 +12,9 @@ export const deleteActivity = (obj) => http.post('/activity/deleteActivity', { p
 //修改活动接口
 export const updateActivity = (obj) => http.post('/activity/updateActivity', obj);
 
+//修改阶段任务信息
+export const  updateTask=(obj)=>http.post('/admin/project/editTask',obj)
+
 //修改活动是否为必修接口
 export const updateActivityToCompulsory = (obj) => http.post('/activity/updateActivityToCompulsory', { params: obj });
 
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 030878b3..a520aab3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -17,7 +17,7 @@
           @click="closeDrawer"
         />
       </div>
-      <div class="contentMain">
+        <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
@@ -214,11 +214,11 @@
             </div>
           </div>
         </div>
-      </div>
+        </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createActivity">确定</button>
-      </div>
+          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="createActivity">确定</button>
+        </div>
     </div>
   </a-drawer>
 </template>
@@ -277,6 +277,14 @@ export default {
     edit: {
       type: Boolean,
       default: false,
+    },
+    editActivityId: {
+      type: Boolean,
+      default: false,
+    },
+    projectTaskId: {
+      type: Boolean,
+      default: false,
     }
   },
   setup(props, ctx) {
@@ -309,13 +317,44 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      console.log("活动ID",props.editActivityId);
+      console.log("项目中任务ID",props.projectTaskId);
+      if(bool){
+        if(props.isStudiscuss == false){
+          if(props.edit){
+            //编辑讨论
+              console.log("props.editActivityId",props.editActivityId)
+                let obj = {
+                  activityId: props.editActivityId,
+                }
+                api.getActivity(obj).then(res => {
+                  console.log('获取讨论信息成功',res.data.data)
+                  
+                  //更新讨论信息
+                  state.inputV1 =  res.data.data.activityName;
+                  state.textV1 = res.data.data.activityNotice;
+                  state.textV2 = res.data.data.activityExplain;
+                  state.inputV2 = res.data.data.activityDuration;
+                  state.inputV3 = res.data.data.activityAddress;
+                  state.inputV5 = res.data.data.afterSignIn;
+                  state.inputV4 = res.data.data.beforeSignIn;
+                  state.radioV1 = res.data.data.standardSettings;
+                  state.time[0] = res.data.data.activityStartTime;
+                  state.time[1] = res.data.data.activityEndTime;
+                  console.log(state.time[0])
+                }).catch(err=>{
+                  console.log('获取讨论信息失败',err)
+                })
+            
+          }
+        }
+      }
     };
     const cloradio1 = (value) => {
       if (value != "") {
         state.radioV1 = "";
       }
     };
-
     //创建活动
     const createActivity = () => {
       if(!state.inputV1){
@@ -352,14 +391,16 @@ export default {
           activityTag: "", //活动逻辑删除标识
           afterSignIn: state.inputV5, //活动开始后多少分钟签到
           beforeSignIn: state.inputV4, //活动开始前多少分钟签到
-          createTime: "", //创建时间
-          createUser: 0, //创建人
           signOutTime: state.inputV6, //签退开始时间
           standardSettings: state.radioV1, //标准设置
-          updateTime: "", //更新时间
-          updateUser: 0, //更新人
+          
       };
-      api
+      if(props.edit){
+        //更新编辑活动信息
+        updateActivity();
+      }else{
+        //新建活动信息
+        api
         .createActivity(obj)
         .then((res) => {          
             console.log("创建成功", res);
@@ -396,7 +437,7 @@ export default {
             }else{
               apiTask
               .addTask({
-                courseId: 0,
+                courseId: res.data.data.activityId,
                 duration: obj.activityDuration,
                 flag: true,
                 name: obj.activityName,
@@ -421,8 +462,36 @@ export default {
         .catch((err) => {
           console.log("创建失败",err);
         })
+      }
+      
+    };
+    //更新编辑活动信息
+    const updateActivity = (obj) => {
+      console.log("编辑");
+      api.updateActivity(obj)
+      .then((res) => {
+        console.log("更新成功",res);
+        let taskObj = {
+          courseId: res.data.data.activityId,
+          duration: obj.activityDuration,
+          flag: true,
+          name: obj.activityName,
+          projectId: props.projectId,
+          projectTaskId: props.projectTaskId,
+          stageId: 0,
+          type: 9,
+        }
+        api.updateTask(taskObj).then((res)=> {
+          console.log("更新任务列表成功",res);
+        })
+        .catch((err)=> {
+          console.log("更新任务列表失败",err);
+        })
+      })
+      .catch((err) => {
+        console.log("更新失败",err);
+      })
     };
-
     return {
       ...toRefs(state),
       afterVisibleChange,
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 5005158b..ccaaad30 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -130,6 +130,10 @@ export default {
     editDiscussId: {
       type: Number,
       default: null,
+    },
+    projectTaskId: {
+      type: Number,
+      default: null,
     }
   },
   setup(props, ctx) {
@@ -150,6 +154,7 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      console.log("项目任务ID",props.projectTaskId);
       if(bool){
         if(props.isStudiscuss == false){
           if(props.edit){
@@ -157,6 +162,7 @@ export default {
               console.log("props.editDiscussId",props.editDiscussId)
                 let formData = new FormData();
                 formData.append('discussId',props.editDiscussId);
+                console.log("formData",formData);
                 api.getDiscussDetail(formData).then(res => {
                   console.log('获取讨论信息成功',res.data.data)
                   //更新讨论信息
@@ -256,12 +262,13 @@ export default {
         api
           .updateDiscuss(obj)
           .then((res)=> {
-            console.log("更新成功",res)
+            console.log("更新成功",res);
+            console.log("项目任务ID",props.projectTaskId)
           let taskObj={
             courseId: res.data.data.discussId,
             name: obj.discussName,
             projectId: props.projectId,
-            projectTaskId: "",
+            projectTaskId: props.projectTaskId,
             stageId: props.stageId,
             type: 8,
           
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index af9b07db..9ecf5d78 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -236,6 +236,7 @@
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:editDiscussId="editDiscussId"
+              v-model:projectTaskId="projectTaskId"
               @changeData="updateTableData"
             />
           </div>
@@ -254,6 +255,8 @@
             <add-active
               v-model:addactiveVisible="addactivevisible"
               v-model:projectId="projectId"
+              v-model:editActivityId="editActivityId"
+              v-model:projectTaskId="projectTaskId"
               v-model:edit="edit"
               v-model:chooseStageId="chooseStageId"
               @changeData="updateTableData"
@@ -913,6 +916,7 @@ export default {
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的id
       editDiscussId:null,//要编辑的讨论的id
+      editActivityId:null,//要编辑的活动id
       EditWorkId:null, // 要编辑的作业id
       EditTestId: null,// 要编辑的考试id
       EditEvalId:null,

From 15210e9064559d38133139599e22525ec1945265 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 9 Nov 2022 09:05:34 +0800
Subject: [PATCH 07/90] =?UTF-8?q?feat:=E6=8A=95=E7=A5=A8=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                    | 29 +++++++++++++++++++++++++---
 src/api/indexEval.js                 |  2 +-
 src/components/drawers/AddInvist.vue |  2 +-
 src/components/drawers/AddVote.vue   |  4 +++-
 src/components/drawers/CreVote.vue   | 24 +++++++++++++++--------
 5 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 379ccd42..fc6622f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,8 +15,10 @@
 				"element-plus": "^2.2.17",
 				"jquery": "^3.6.1",
 				"qs": "^6.11.0",
+				"sortablejs": "^1.15.0",
 				"vue": "^3.2.13",
 				"vue-router": "^4.0.3",
+				"vuedraggable": "^4.1.0",
 				"vuex": "^4.0.0"
 			},
 			"devDependencies": {
@@ -9522,6 +9524,11 @@
 				"websocket-driver": "^0.7.4"
 			}
 		},
+		"node_modules/sortablejs": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
+			"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
+		},
 		"node_modules/source-map": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -10447,6 +10454,22 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/vuedraggable": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
+			"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+			"dependencies": {
+				"sortablejs": "1.14.0"
+			},
+			"peerDependencies": {
+				"vue": "^3.0.1"
+			}
+		},
+		"node_modules/vuedraggable/node_modules/sortablejs": {
+			"version": "1.14.0",
+			"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
+			"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+		},
 		"node_modules/vuex": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz",
@@ -14906,9 +14929,9 @@
 			}
 		},
 		"dayjs": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
-			"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
+			"version": "1.11.5",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
+			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
 		},
 		"debug": {
 			"version": "4.3.4",
diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index f76de0b9..01f7794f 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -1,5 +1,5 @@
 import http from "./config";
-import qs from 'qs';
+// import qs from 'qs';
 
 /**
  * 接口传参数方式（get）
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 61f36c1d..8655565a 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -269,7 +269,6 @@ export default {
         appraiseId: 0,
         appraiseStartTime: "",
         appraiseTag: "",
-        createTime: "",
         createUser: 0,
         researchId: 0,
         researchName: "",
@@ -325,6 +324,7 @@ export default {
           // state.createLoading = false;
         });
     };
+    //搜索评估信息接口
 
     onMounted(() => {
       // createInvist();
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index 39681d3e..d13fe14e 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -65,7 +65,7 @@
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">传过来的name</span>
+                  <span style="color: #388be1">{{voteStemName}}</span>
                   <div class="delBox" @click="delBox()"></div>
                 </div>
               </div>
@@ -197,6 +197,7 @@ export default {
       ascriptionId: "",
       voteStemId: "",
       voteId:"",
+      voteStemName:"",
     });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
@@ -213,6 +214,7 @@ export default {
       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);
     };
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index fb0c3ebf..9722df81 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -159,15 +159,21 @@ export default {
 
     //创建题干接口
     const createQueTit = () => {
-      if (!state.questions[0].inputV) {
+      if (state.inputV1 == "") {
         message.destroy();
-        return message.info("请输入题干");
+        return message.info("请输入投票名称");
       }
+      // if (!state.questions.inputV) {
+      //   message.destroy();
+      //   return message.info("请输入题干");
+      // }
       // if (!state.questions.optins.opvalue) {
       //   message.destroy();
       //   return message.info("请输入选项");
       // }
-      console.log(state.questions[0].inputV);
+      console.log('111111',state.questions);
+      // console.log('22222',state.questions.inputV);
+      // console.log('333333',state.questions.options);
       let obj = [
         {
           ascriptionId: 0,
@@ -176,7 +182,7 @@ export default {
             {
               createUser: 0,
               optionId: 0,
-              optionName: "",
+              optionName: state.questions[0].options[0].opvalue,
               optionOrderNum: "",
               optionPictureAddress: "",
               stem: "",
@@ -190,15 +196,16 @@ export default {
           updateUser: 0,
           voteStemFlag: "",
           voteStemId: 0,
-          voteStemName: "",
+          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('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 = {
@@ -217,7 +224,8 @@ export default {
           let stemData = {
             creVote: state.creVote,
             ascriptionId: res.data.data[0].ascriptionId,
-            voteStemId:res.data.data[0].voteStemId
+            voteStemId: res.data.data[0].voteStemId,
+            voteStemName: state.questions[0].inputV,
           };
           ctx.emit("getData", stemData);
           closeDrawer();

From 3ec7c07e577d8085fc872170da736781989ca4ab Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 9 Nov 2022 09:36:45 +0800
Subject: [PATCH 08/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E5=AD=98=E4=B8=BA=E6=A8=A1=E7=89=88,=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                         |  98 +++++++
 package.json                              |   2 +
 src/api/index.js                          |  12 +-
 src/api/index1.js                         |   2 +-
 src/views/projectcenter/ProjectManage.vue | 300 +++++++++++++++-------
 src/views/system/SystemManage.vue         |  93 ++++++-
 6 files changed, 411 insertions(+), 96 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 52bc5ebc..be3fa8d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,9 @@
 				"axios": "^1.1.3",
 				"core-js": "^3.8.3",
 				"element-plus": "^2.2.17",
+				"html2canvas": "^1.4.1",
 				"jquery": "^3.6.1",
+				"qrcode.vue": "^3.3.3",
 				"qs": "^6.11.0",
 				"sortablejs": "^1.15.0",
 				"vue": "^3.2.13",
@@ -3514,6 +3516,14 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true
 		},
+		"node_modules/base64-arraybuffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+			"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+			"engines": {
+				"node": ">= 0.6.0"
+			}
+		},
 		"node_modules/base64-js": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
@@ -4279,6 +4289,14 @@
 				"node": "^10 || ^12 || >=14"
 			}
 		},
+		"node_modules/css-line-break": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+			"integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+			"dependencies": {
+				"utrie": "^1.0.2"
+			}
+		},
 		"node_modules/css-loader": {
 			"version": "6.7.1",
 			"resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-6.7.1.tgz",
@@ -6332,6 +6350,18 @@
 				"node": ">=10.13.0"
 			}
 		},
+		"node_modules/html2canvas": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+			"integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+			"dependencies": {
+				"css-line-break": "^2.1.0",
+				"text-segmentation": "^1.0.3"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
 		"node_modules/htmlparser2": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -8757,6 +8787,14 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/qrcode.vue": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-3.3.3.tgz",
+			"integrity": "sha512-OsD4tQjIbxg/K6D5ZkWjBdYI9eg9K2i8qeYILdEAX5mdAydSAxV7xKmmZSP/hA12olLqEMZ9ryqDQrwa9jEMgw==",
+			"peerDependencies": {
+				"vue": "^3.0.0"
+			}
+		},
 		"node_modules/qs": {
 			"version": "6.11.0",
 			"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
@@ -9911,6 +9949,14 @@
 			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
 			"dev": true
 		},
+		"node_modules/text-segmentation": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+			"integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+			"dependencies": {
+				"utrie": "^1.0.2"
+			}
+		},
 		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz",
@@ -10186,6 +10232,14 @@
 				"node": ">= 0.4.0"
 			}
 		},
+		"node_modules/utrie": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+			"integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+			"dependencies": {
+				"base64-arraybuffer": "^1.0.2"
+			}
+		},
 		"node_modules/uuid": {
 			"version": "8.3.2",
 			"resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
@@ -14091,6 +14145,11 @@
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
 			"dev": true
 		},
+		"base64-arraybuffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+			"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
+		},
 		"base64-js": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
@@ -14733,6 +14792,14 @@
 			"integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
 			"dev": true
 		},
+		"css-line-break": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+			"integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+			"requires": {
+				"utrie": "^1.0.2"
+			}
+		},
 		"css-loader": {
 			"version": "6.7.1",
 			"resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-6.7.1.tgz",
@@ -16424,6 +16491,15 @@
 				"tapable": "^2.0.0"
 			}
 		},
+		"html2canvas": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+			"integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+			"requires": {
+				"css-line-break": "^2.1.0",
+				"text-segmentation": "^1.0.3"
+			}
+		},
 		"htmlparser2": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -18387,6 +18463,12 @@
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
 			"dev": true
 		},
+		"qrcode.vue": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-3.3.3.tgz",
+			"integrity": "sha512-OsD4tQjIbxg/K6D5ZkWjBdYI9eg9K2i8qeYILdEAX5mdAydSAxV7xKmmZSP/hA12olLqEMZ9ryqDQrwa9jEMgw==",
+			"requires": {}
+		},
 		"qs": {
 			"version": "6.11.0",
 			"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
@@ -19358,6 +19440,14 @@
 				}
 			}
 		},
+		"text-segmentation": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+			"integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+			"requires": {
+				"utrie": "^1.0.2"
+			}
+		},
 		"text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz",
@@ -19578,6 +19668,14 @@
 			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
 			"dev": true
 		},
+		"utrie": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+			"integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+			"requires": {
+				"base64-arraybuffer": "^1.0.2"
+			}
+		},
 		"uuid": {
 			"version": "8.3.2",
 			"resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
diff --git a/package.json b/package.json
index 7f47e397..faa48370 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
 		"axios": "^1.1.3",
 		"core-js": "^3.8.3",
 		"element-plus": "^2.2.17",
+		"html2canvas": "^1.4.1",
 		"jquery": "^3.6.1",
+		"qrcode.vue": "^3.3.3",
 		"qs": "^6.11.0",
 		"sortablejs": "^1.15.0",
 		"vue": "^3.2.13",
diff --git a/src/api/index.js b/src/api/index.js
index b0db5ad7..994fc519 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-07 20:11:23
+ * @LastEditTime: 2022-11-09 09:32:35
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,4 +56,12 @@ export const getProjectDetail = (obj) => http.get('/admin/project/detail', { par
 //发布项目
 export const releaseProject=(obj)=>http.post('/admin/project/publish',obj)
 //获取项目学员
-export const projectStudent=(obj)=>http.post('/admin/project/studentList',obj)
\ No newline at end of file
+export const projectStudent=(obj)=>http.post('/admin/project/studentList',obj)
+//撤回发布、结束
+export const handleProject=(obj)=>http.post('/admin/project/handle',obj)
+
+
+
+
+//获取讨论信息
+export const getDiscussDetail=(obj)=>http.post('/discuss/getDiscussDetail',obj)
diff --git a/src/api/index1.js b/src/api/index1.js
index 16e7ee9d..0024073f 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-06 16:48:50
+ * @LastEditTime: 2022-11-09 09:32:52
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 085f353d..a121bc62 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -58,13 +58,13 @@
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
-          <div class="btnn btn1">
+          <div class="btnn btn1" @click="searchSubmit">
             <div class="search"></div>
-            <div class="btnText" v-on:click="searchSubmit">搜索</div>
+            <div class="btnText" >搜索</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn2" @click="searchReset">
             <div class="search"></div>
-            <div class="btnText" v-on:click="searchReset">重置</div>
+            <div class="btnText" >重置</div>
           </div>
         </div>
       </div>
@@ -849,11 +849,11 @@
             </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="closeStopModal">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="finishProject">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -879,11 +879,11 @@
             <span>您确定要删除此项目吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="closeDeleteModal">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="deleteProject">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -910,10 +910,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+              <div class="btnText" @click="closeStartModal">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+              <div class="btnText" @click="templateProject">确定</div>
             </div>
           </div>
         </div>
@@ -1014,11 +1014,11 @@
             <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="closeBackModal">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="recallProject">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -1080,8 +1080,17 @@ export default {
 
       currentEditChildrensProjectId: "",
       dcProjectID: "",
+
+  currentPage: 1, //当前页
+      tableDataTotal: -1, //学习路径列表总数
+      pageSize: 10, //每页10条数据
+
 			projectStudentsNum:0,//发布弹窗-学员人数
       releaseProjectId: null, //发布的项目id
+      recallProjectId:null,//撤回的项目id
+      finishProjectId:null,//结束的项目id
+       deleteProjectId:null,//删除的项目id
+       templateProjectId:null,//存为模版的项目id
     });
     // 数据接入 - start -
     const router = useRouter();
@@ -1146,13 +1155,16 @@ export default {
       endTime = "";
       status = null;
       managerid = "";
+      state.currentPage=1
       getTableDate();
     };
 
     const searchSubmit = () => {
+      console.log('点击了搜索')
+      state.currentPage=1
       const obj = {
-        pageNo: 1,
-        pageSize: 10,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
         beginTime: beginTime,
         endTime: endTime,
         status: status,
@@ -1354,6 +1366,7 @@ export default {
             state.doublepro = false;
             message.destroy();
             message.success("创建成功");
+            state.currentPage=1
             getTableDate();
           }
         })
@@ -1598,6 +1611,7 @@ export default {
             state.doublesonpro = false;
             message.destroy();
             message.success("创建成功");
+             state.currentPage=1
             getTableDate();
           }
         })
@@ -1608,6 +1622,9 @@ export default {
         });
     };
 
+
+
+
     // 编辑多层子项目
     const edvalue6 = ref("");
     const edvalue7 = ref([]);
@@ -1743,26 +1760,8 @@ export default {
       state.eddoublesonpro = false;
     };
 
-    //确认发布项目
-    const releaseProject = () => {
-			console.log('点击发布')
-      let obj = {
-        projectId: state.releaseProjectId,
-      };
-      api
-        .releaseProject(obj)
-        .then((res) => {
-          console.log("发布成功", res);
-					 message.destroy();
-          message.success("发布成功");
-					state.projectPub = false
-					getTableDate()
-        })
-        .catch((err) => {
-          console.log("发布失败", err);
-        });
-    };
-    //发布弹窗
+ 
+    //打开发布弹窗
     const showProjectPub = (projectId) => {
       state.projectPub = true;
       state.releaseProjectId = projectId;
@@ -1783,9 +1782,142 @@ console.log('获取学员人数失败',err)
 			})
 			//获取阶段及任务总数
     };
-
-		//撤回
-
+       //确认发布项目
+    const releaseProject = () => {
+			console.log('点击发布')
+      let obj = {
+        projectId: state.releaseProjectId,
+      };
+      api
+        .releaseProject(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+					 message.destroy();
+          message.success("发布成功");
+					state.projectPub = false
+					getTableDate()
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
+    };
+    //关闭发布弹窗
+     const closeProjectPub = () => {
+      state.projectPub = false;
+    };
+        //打开撤回弹窗
+ const showBackModal = (projectId) => {
+      state.backModal = true;
+state.recallProjectId = projectId;
+    };
+    //确认撤回发布
+     const recallProject = () => {
+      let obj = {
+        projectId: state.recallProjectId,
+        type: 0,
+      };
+      api
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
+    };
+        //关闭撤回弹窗
+    const closeBackModal = () => {
+      state.backModal = false;
+    };
+//打开结束弹窗
+const showStopModal = (projectId) => {
+      state.stopModal = true;
+      state.finishProjectId=projectId
+    };
+//确认结束
+const finishProject=()=>{
+let obj = {
+        projectId: state.finishProjectId,
+        type: -1,
+      };
+      api
+        .handleProject(obj)
+        .then((res) => {
+          console.log("结束成功", res);
+          message.destroy();
+          message.success("已结束");
+          state.stopModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("结束失败", err);
+        });
+}
+    //关闭结束弹窗
+    const closeStopModal = () => {
+      state.stopModal = false;
+    };
+    //打开删除弹窗
+const showDeleteModal = (projectId) => {
+      state.deleteModal = true;
+      state.deleteProjectId=projectId
+    };
+    //确认删除
+const deleteProject=()=>{
+let obj = {
+        projectId: state.deleteProjectId,
+        type: -2,
+      };
+      api
+        .handleProject(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.destroy();
+          message.success("删除成功");
+          state.deleteModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+}
+    //关闭删除弹窗
+    const closeDeleteModal = () => {
+      state.deleteModal = false;
+    };
+//打开存为模版弹窗
+ const showStartModal = (projectId) => {
+      state.startModal = true;
+      state.templateProjectId=projectId
+    };
+    //确认存为模版
+const templateProject=()=>{
+let obj = {
+        projectId: state.templateProjectId,
+        type: 1,
+      };
+      api
+        .handleProject(obj)
+        .then((res) => {
+          console.log("模版保存成功", res);
+          message.destroy();
+          message.success("模版保存成功");
+          state.startModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("模版保存失败", err);
+        });
+}
+    //关闭存为模版弹窗
+    const closeStartModal = () => {
+      state.startModal = false;
+    };
+   
 
     // 数据接入 - end -
 
@@ -1802,9 +1934,7 @@ console.log('获取学员人数失败',err)
 
     // 获取项目列表信息
     let tableData = ref([]);
-    let currentPage = ref(1);
-    let tableDataTotal = ref("");
-    let pageSize = ref(10);
+    
 
     const columns = ref([
       {
@@ -1995,7 +2125,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          showDeleteModal();
+                          showDeleteModal(value.record.projectId);
                         }}
                       >
                         删除
@@ -2181,7 +2311,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          showDeleteModal();
+                          showDeleteModal(value.record.projectId);
                         }}
                       >
                         删除
@@ -2296,7 +2426,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          showDeleteModal();
+                          showDeleteModal(value.record.projectId);
                         }}
                       >
                         删除
@@ -2448,7 +2578,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          showDeleteModal();
+                          showDeleteModal(value.record.projectId);
                         }}
                       >
                         删除
@@ -2589,7 +2719,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          showDeleteModal();
+                          showDeleteModal(value.record.projectId);
                         }}
                       >
                         删除
@@ -2598,7 +2728,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="存为模版" label="存为模版">
                       <div
                         onClick={() => {
-                          showStartModal();
+                          showStartModal(value.record.projectId);
                         }}
                       >
                         存为模版
@@ -2639,7 +2769,7 @@ console.log('获取学员人数失败',err)
                       </a-select-option>
                       <div
                         onClick={() => {
-                          showStartModal();
+                          showStartModal(value.record.projectId);
                         }}
                       >
                         存为模版
@@ -2648,7 +2778,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="结束" label="结束">
                       <div
                         onClick={() => {
-                          showStopModal();
+                          showStopModal(value.record.projectId);
                         }}
                       >
                         结束
@@ -2657,7 +2787,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="撤回" label="撤回">
                       <div
                         onClick={() => {
-                          showBackModal();
+                          showBackModal(value.record.projectId);
                         }}
                       >
                         撤回
@@ -2686,7 +2816,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="存为模版" label="存为模版">
                       <div
                         onClick={() => {
-                          showStartModal();
+                          showStartModal(value.record.projectId);
                         }}
                       >
                         存为模版
@@ -2704,7 +2834,7 @@ console.log('获取学员人数失败',err)
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          showDeleteModal();
+                          showDeleteModal(value.record.projectId);
                         }}
                       >
                         删除
@@ -2738,17 +2868,25 @@ console.log('获取学员人数失败',err)
 
     const getTableDate = (pagedata) => {
       let obj = {
-        pageNo: 1,
-        pageSize: 10,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
       };
       api
         .getProjectList(pagedata ? pagedata : obj)
         .then((res) => {
           console.log(res);
           if (res.status == 200 && res.data.code == 200) {
-            tableDataTotal.value = Number(res.data.data.total);
+            state.tableDataTotal = Number(res.data.data.total);
             let data = res.data.data.rows;
             // let data = state.tableData;
+             if (
+              data.length === 0 &&
+              res.data.data.total > 0 &&
+              state.currentPage > 1
+            ) {
+              state.currentPage = state.currentPage - 1;
+              getTableDate();
+            }
             console.log("1266", data);
             data.map((value) => {
               console.log("value %o", value);
@@ -2788,10 +2926,10 @@ console.log('获取学员人数失败',err)
     // 翻页
     const changePagination = (page) => {
       console.log(page);
-      currentPage.value = page;
+      state.currentPage = page;
       let pagedata = {
         pageNo: page,
-        pageSize: 10,
+        pageSize: state.pageSize,
       };
       getTableDate(pagedata);
       // getLearnPath();
@@ -2826,30 +2964,9 @@ console.log('获取学员人数失败',err)
     const closeCopyModal = () => {
       state.copyModal = false;
     };
-    const showStopModal = () => {
-      state.stopModal = true;
-    };
-    const closeStopModal = () => {
-      state.stopModal = false;
-    };
-    const showDeleteModal = () => {
-      state.deleteModal = true;
-    };
-    const closeDeleteModal = () => {
-      state.deleteModal = false;
-    };
-    const showStartModal = () => {
-      state.startModal = true;
-    };
-    const closeStartModal = () => {
-      state.startModal = false;
-    };
-    const showBackModal = () => {
-      state.backModal = true;
-    };
-    const closeBackModal = () => {
-      state.backModal = false;
-    };
+    
+    
+   
     const showProjOwner = () => {
       state.ProjOwnervisible = true;
     };
@@ -2862,9 +2979,7 @@ console.log('获取学员人数失败',err)
     const showProjManage = () => {
       state.ProjManagevisible = true;
     };
-    const closeProjectPub = () => {
-      state.projectPub = false;
-    };
+   
     return {
       ...toRefs(state),
       selectProjectName,
@@ -2895,9 +3010,6 @@ console.log('获取学员人数失败',err)
       closeProjectPub,
 
       tableData,
-      currentPage,
-      tableDataTotal,
-      pageSize,
       columns,
       createStoreyProject,
       classifyList,
@@ -2964,6 +3076,10 @@ console.log('获取学员人数失败',err)
       closeeditModal3,
       releaseProject,
       showProjectPub,
+      recallProject,
+      finishProject,
+      deleteProject,
+      templateProject,
     };
   },
 };
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 9c791a40..1c024efb 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -70,7 +70,6 @@
       animation="1000"
       @start="onStart"
       @end="onEnd"
-      :list="draggableList"
     >
       <template #item="{ element }">
         <div class="item" :key="element.id">
@@ -78,6 +77,17 @@
         </div>
       </template>
     </draggable>
+    <div id="qrcode" style="display:flex;flex-direction: column;">
+      <div>下载二维码</div>
+      <qrcode-vue
+        :value="qrcodeUrl"
+        :size="qrcodeSize"
+        style="width: 200px;height: 200px"
+      ></qrcode-vue>
+    </div>
+    <div @click="downloadQr(200)">下载200</div>
+    <div @click="downloadQr(400)">下载400</div>
+    <div @click="downloadQr(800)">下载800</div>
   </div>
 </template>
 <script>
@@ -93,6 +103,8 @@ import * as api from "../../api/index1";
 // }
 import { useRouter } from "vue-router";
 import draggable from "vuedraggable";
+import QrcodeVue from "qrcode.vue";
+import html2canvas from "html2canvas";
 export default {
   name: "SystemManage",
   components: {
@@ -100,6 +112,7 @@ export default {
     // LoadingOutlined,
     // PlusOutlined,
     draggable,
+    QrcodeVue,
   },
   setup() {
     const state = reactive({
@@ -135,6 +148,8 @@ export default {
           name: "拖拽六",
         },
       ],
+      qrcodeUrl: "https://www.baidu.com/",
+      qrcodeSize:800,
     });
 
     const showDrawer = () => {
@@ -214,6 +229,80 @@ export default {
     const golearningpath = () => {
       router.push({ path: "/learningpath", params: { id: 1 } });
     };
+
+    //下载二维码图片
+    const downloadQr = (num) => {
+      console.log("num", num);
+      state.qrcodeSize=num
+ let filename = `${new Date().getTime()}.png`;
+ let canvas=document.getElementsByTagName('canvas')[0]
+        let imageUrl = canvas.toDataURL("image/png")
+
+let canvasBox = document.createElement('canvas');
+	let	ctx = canvasBox.getContext("2d");
+		var img = new Image();
+		// 需要添加文字的图片
+		img.src = imageUrl;
+		// 等待图片加载完成
+		img.onload = function(){
+			// 将图片添加到canvas
+		    ctx.drawImage(img, 0, 0, 1240, 2208)
+			// 设置字体
+			ctx.font = "73px 微软雅黑 bolder"
+			// 设置字体颜色
+			ctx.fillStyle = "#955f17"
+			ctx.textAlign = "center"
+			// 添加文字和位置
+			ctx.fillText("微信名", 621, 1050);
+    
+			// 导出为图片
+			let url = canvasBox.toDataURL("image/png")
+      let a = document.createElement("a");
+			 a.style.display = "none";
+        a.download = filename;
+        a.href = url;
+        document.body.appendChild(a);
+        a.click();
+    }
+
+
+        // let a = document.createElement("a");
+        // a.style.display = "none";
+        // a.download = filename;
+        // a.href = imageUrl;
+        // document.body.appendChild(a);
+        // a.click();
+
+
+      html2canvas(document.querySelector("#qrcode"), {
+        useCORS: true, //支持图片跨域
+      }).then((canvas) => {
+// var extra_canvas = document.createElement("canvas");
+//                 extra_canvas.setAttribute('width',num);
+//                 extra_canvas.setAttribute('height',num);
+//                 var ctx = extra_canvas.getContext('2d');
+//                 ctx.drawImage(canvas,0,0,num,num);
+//                 let filename = `${new Date().getTime()}.png`;
+//                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
+
+        console.log('canvas',canvas, canvas.width,canvas.style.width)
+      
+      // //   let ctx = canvas.getContext('2d');
+      // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
+      // //            canvas.width=num
+      // //  canvas.height=num
+      // //  canvas.style.width=num+'px'
+      // // canvas.style.height=num+'px'
+      //   let filename = `${new Date().getTime()}.png`;
+      //   let imageUrl = canvas.toDataURL("image/png");
+      //   let a = document.createElement("a");
+      //   a.style.display = "none";
+      //   a.download = filename;
+      //   a.href = imageUrl;
+      //   document.body.appendChild(a);
+      //   a.click();
+      });
+    };
     return {
       ...toRefs(state),
       showDrawer,
@@ -221,6 +310,7 @@ export default {
       handleChange,
       beforeUpload,
       golearningpath,
+      downloadQr,
     };
   },
 };
@@ -228,6 +318,7 @@ export default {
 <style lang="scss">
 .systemManage {
   width: 100%;
+  
   .ant-input-textarea-show-count {
     position: relative;
   }

From 5393f1db4501338e15c3040c122a203f86d84445 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 9 Nov 2022 09:39:28 +0800
Subject: [PATCH 09/90] =?UTF-8?q?feat=EF=BC=9A=E8=AF=84=E4=BC=B0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=20=E9=87=8D=E7=BD=AE=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddInvist.vue | 86 +++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 7 deletions(-)

diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 8655565a..d84c6c9e 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -28,11 +28,11 @@
                 maxlength="20"
               />
             </div>
-            <div class="btns">
+            <div class="btns" @click="searchInvist">
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btnsn">
+            <div class="btnsn" @click="resetInvist">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -182,7 +182,7 @@ export default {
       return columns;
     };
     const rowSelection = {
-      type: 'radio',
+      type: "radio",
       // onChange: (selectedRowKeys, selectedRows) => {
       //   this.selectedRowKeys = selectedRowKeys
       //   if (selectedRows.length > 1) {
@@ -199,9 +199,16 @@ export default {
       //   // // Column configuration not to be checked
       //   name: record.name,
       // }),
-      onSelect: ( selectedRows, selected,selectedRowKeys) => {
-        console.log('selectedRowKeys',selectedRowKeys,'selectedRows', selectedRows, 'selected', selected)
-      }
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "selectedRowKeys",
+          selectedRowKeys,
+          "selectedRows",
+          selectedRows,
+          "selected",
+          selected
+        );
+      },
     };
 
     const getTableDate = (tableData) => {
@@ -325,7 +332,70 @@ export default {
         });
     };
     //搜索评估信息接口
-
+    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);
+        });
+    };
+    //重置评估信息
+    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);
+        });
+    };
     onMounted(() => {
       // createInvist();
       getAllInvistText();
@@ -338,6 +408,8 @@ export default {
       rowSelection,
       createInvist,
       getAllInvistText,
+      searchInvist,
+      resetInvist,
     };
   },
 };

From fa719f0eea5af052d2ce9c1c1d9d5799701e102f Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Wed, 9 Nov 2022 11:45:25 +0800
Subject: [PATCH 10/90] =?UTF-8?q?feat=EF=BC=9A=E8=8E=B7=E5=8F=96=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddHomework.vue | 428 ++++++++++++++-----------
 src/views/projectcenter/TaskPage.vue   |  94 ++++--
 2 files changed, 318 insertions(+), 204 deletions(-)

diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index fa3a1fe9..c3c75f15 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -1,58 +1,95 @@
 <template>
-  <a-drawer :visible="addhomeworkVisible" class="drawerStyle addhomeworkDrawer" width="80%" placement="right"
-    @after-visible-change="afterVisibleChange">
+  <a-drawer
+    :visible="addhomeworkVisible"
+    class="drawerStyle addhomeworkDrawer"
+    width="80%"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ edit ? '编辑' : '添加' }}作业</div>
-        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer" />
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
       </div>
-      <a-form ref="formRef" name="custom-validation" :model="formState" :rules="rules" v-bind="layout"
-        @finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
+      <a-form
+        ref="formRef"
+        name="custom-validation"
+        :model="formState"
+        :rules="rules"
+        v-bind="layout"
+        @finish="handleFinish"
+        @validate="handleValidate"
+        @finishFailed="handleFinishFailed"
+      >
         <div class="contentMain">
           <div class="main_left">
-
             <div class="main_item">
               <div class="btnbox">
                 <a-form-item has-feedback label="作业名称" name="workName">
-                  <a-input v-model:value="formState.workName" style="width: 424px; height: 32px;margin-left: 35px;"
-                    placeholder="请输入作业名称" autocomplete="off" />
+                  <a-input
+                    v-model:value="formState.workName"
+                    style="width: 424px; height: 32px; margin-left: 35px"
+                    placeholder="请输入作业名称"
+                    autocomplete="off"
+                  />
                 </a-form-item>
-
               </div>
             </div>
             <div class="main_item2">
               <a-form-item has-feedback label="作业要求" name="workRequirement">
-                <a-textarea v-model:value="formState.workRequirement" placeholder="请输入作业要求" autocomplete="off"
-                  allow-clear style="margin-left: 35px" maxlength="150" />
+                <a-textarea
+                  v-model:value="formState.workRequirement"
+                  placeholder="请输入作业要求"
+                  autocomplete="off"
+                  allow-clear
+                  style="margin-left: 35px"
+                  maxlength="150"
+                />
               </a-form-item>
             </div>
             <div class="main_item">
               <div class="btnbox">
                 <a-form-item has-feedback label="提交时间" name="choosedTime">
-                  <a-range-picker style="width: 424px;margin-left: 35px;" v-model:value="formState.choosedTime"
-                    format="YYYY-MM-DD" :placeholder="['      开始时间', '        结束时间']" />
+                  <a-range-picker
+                    style="width: 424px; margin-left: 35px"
+                    v-model:value="formState.choosedTime"
+                    format="YYYY-MM-DD"
+                    :placeholder="['      开始时间', '        结束时间']"
+                  />
                 </a-form-item>
               </div>
             </div>
             <div class="main_item">
               <div class="signbox">
                 <div class="sign">
-                  <img src="@/assets/images/coursewareManage/enclosure.png" alt="" />
+                  <img
+                    src="@/assets/images/coursewareManage/enclosure.png"
+                    alt=""
+                  />
                 </div>
                 <span style="margin-right: 3px">附件：</span>
               </div>
               <div class="btnbox">
-                <a-upload v-model:file-list="fileList" name="file" action="/api/file/upload" @change="handleChange">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
                   <button class="xkbtn" type="button">上传附件</button>
                 </a-upload>
               </div>
             </div>
-            <div class="main_item" style="margin-top:-25px;">
-              <div class="signbox">
-              </div>
+            <div class="main_item" style="margin-top: -25px">
+              <div class="signbox"></div>
               <div class="btnbox">
-                <span style="color:#999999;">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
+                <span style="color: #999999"
+                  >支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span
+                >
               </div>
             </div>
           </div>
@@ -62,21 +99,23 @@
           <a-button class="btn2" html-type="submit">确定</a-button>
         </div>
       </a-form>
-      
-
     </div>
     <!--  加载动画 -->
-    <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
-        <a-spin :spinning="addLoading" tip="添加中..." />
-      </div>
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="添加中..." />
+    </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, ref, toRefs } from "vue";
 import { message } from "ant-design-vue";
-import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing } from "@/api/indexWork";
+import {
+  createWorkTask,
+  queryWorkDetailById,
+  updateWorkTaskUsing,
+} from "@/api/indexWork";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 const rowSelection = ref({
   checkStrictly: false,
@@ -103,7 +142,8 @@ export default {
       type: Boolean,
       default: false,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -119,15 +159,18 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Boolean,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
+    EditWorkId: {
+      // 要编辑的workId
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -138,53 +181,59 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
     const formState = reactive({
-      workName: '',
-      workRequirement: '',
-      choosedTime: '',
+      workName: "",
+      workRequirement: "",
+      choosedTime: "",
     });
     const state = reactive({
       addLoading: false,
-    })
+    });
     const formRef = ref();
 
     let checkWorkName = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
 
     let checkWorkRequirement = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业要求');
+        return Promise.reject("请输入作业要求");
       }
     };
 
     let checkTime = async (_rule, value) => {
       if (!value.length) {
-        return Promise.reject('请选择时间');
+        return Promise.reject("请选择时间");
       }
     };
 
     const rules = {
-      workName: [{
-        required: true,
-        validator: checkWorkName,
-        trigger: 'change',
-      }],
-      workRequirement: [{
-        required: true,
-        validator: checkWorkRequirement,
-        trigger: 'change',
-      }],
-      choosedTime: [{
-        required: true,
-        validator: checkTime,
-        trigger: 'change',
-      }],
+      workName: [
+        {
+          required: true,
+          validator: checkWorkName,
+          trigger: "change",
+        },
+      ],
+      workRequirement: [
+        {
+          required: true,
+          validator: checkWorkRequirement,
+          trigger: "change",
+        },
+      ],
+      choosedTime: [
+        {
+          required: true,
+          validator: checkTime,
+          trigger: "change",
+        },
+      ],
     };
     // const layout = {
     //   labelCol: {
@@ -194,12 +243,12 @@ export default {
     //     span: 14,
     //   },
     // };
-    const handleFinish = values => {
+    const handleFinish = (values) => {
       console.log(values);
-      updateWork(props.workId)
+      updateWork(props.workId);
     };
 
-    const handleFinishFailed = errors => {
+    const handleFinishFailed = (errors) => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
@@ -211,14 +260,14 @@ export default {
     const handleValidate = (...args) => {
       console.log(args);
     };
-    const handleChange = info => {
-      if (info.file.status !== 'uploading') {
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
         console.log(info.file, info.fileList);
       }
 
-      if (info.file.status === 'done') {
+      if (info.file.status === "done") {
         message.success(`${info.file.name} 文件上传成功`);
-      } else if (info.file.status === 'error') {
+      } else if (info.file.status === "error") {
         message.error(`${info.file.name} 文件上传失败.`);
       }
     };
@@ -227,146 +276,161 @@ export default {
     const closeDrawer = () => {
       resetForm();
       fileList.value = [];
-      formState.choosedTime = '';
+      formState.choosedTime = "";
       ctx.emit("update:addhomeworkVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
-      if (props.addhomeworkVisible && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求, 
-        queryWork()
+      if (props.addhomeworkVisible && props.edit) {
+        // 该页面显示同时 edit为true 时，发送查询请求,
+        queryWork();
       }
       console.log("state", bool);
     };
 
     const updateWork = () => {
       state.addLoading = true;
-        if (props.edit) { // 编辑任务
-          myUpdateWorkTaskUsing()
-        } else {  // 创建任务
-          console.log('创建任务***************');
-          myCreateWorkTask()
-        }
-      
+      if (props.edit) {
+        // 编辑任务
+        myUpdateWorkTaskUsing();
+      } else {
+        // 创建任务
+        console.log("创建任务***************");
+        myCreateWorkTask();
+      }
     };
 
-        // 新增任务
-        const myCreateWorkTask = () => {
-          let obj = {
-            "createTime": "",
-            "createUser": 0,
-            "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "updateTime": "",
-            "updateUser": 0,
-            "workEnclosureAddress": "",
-            "workFlag": "",
-            "workId": 0,
-            "workName": formState.workName,
-            "workRequirement": formState.workRequirement,
-            "workTag": ""
-          }
-          createWorkTask(obj).then((res) => {
-            if(props.isLevel) {
+    // 新增任务
+    const myCreateWorkTask = () => {
+      let obj = {
+        createTime: "",
+        createUser: 0,
+        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+        updateTime: "",
+        updateUser: 0,
+        workEnclosureAddress: "",
+        workFlag: "",
+        workId: 0,
+        workName: formState.workName,
+        workRequirement: formState.workRequirement,
+        workTag: "",
+      };
+      createWorkTask(obj)
+        .then((res) => {
+          if (props.isLevel) {
             // 如果是关卡页面进入 ---------------------------------
-              myRouterEditTask(res.data.data.workId);
-            }else {
-              myProjectEditTask(res.data.data.workId);
-            }
-            
-          }).catch((err) => {
-            message.error(`添加失败${err}`)
-          })
-        }
-        // 编辑任务
-        const myUpdateWorkTaskUsing = () => {
-          let editObj = {
-            "createTime": "",
-            "createUser": 0,
-            "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "updateTime": "",
-            "updateUser": 0,
-            "workEnclosureAddress": "",
-            "workFlag": "",
-            "workId": props.EditWorkId,
-            "workName": formState.workName,
-            "workRequirement": formState.workRequirement,
-            "workTag": ""
+            myRouterEditTask(res.data.data.workId);
+          } else {
+            myProjectEditTask(res.data.data.workId);
           }
-          updateWorkTaskUsing(editObj).then((res) => {
-          console.log(res);
-          if(props.isLevel) {
-            // 如果是关卡页面进入 ---------------------------------
-              myRouterEditTask(res.data.data.workId);
-            }else {
-              myProjectEditTask(res.data.data.workId);
-            }
-        }).catch((err) => {
-          message.error(`编辑失败${err}`)
         })
-        }
-        // 查询任务
-        const queryWork = () => {
-          state.addLoading = true;
-          queryWorkDetailById({workId:props.EditWorkId}).then((res) => {
-            console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
-            formState.workName = res.data.data.workName;
-            formState.workRequirement = res.data.data.workRequirement;
-            formState.choosedTime = [dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"), dayjs(res.data.data.submitEndTime, "YYYY-MM-DD")]
-            console.log(res);
-            state.addLoading = false;
-          }).catch(() => {
-            message.error(`查询失败`)
-          })
-        };
-        // 新增编辑或新增项目任务
-        const myProjectEditTask = (workId) => {
-          let editObj = {
-          "courseId": workId,
-          "duration": 60,
-          "flag": true,
-          "name": formState.workName,
-          "projectId": props.projectId,
-          "projectTaskId":  props.projectTaskId || 0,
-          "stageId": props.chooseStageId,
-          "type": 4
-        }
-        ProjectEditTask(editObj).then(res => {
+        .catch((err) => {
+          message.error(`添加失败${err}`);
+        });
+    };
+    // 编辑任务
+    const myUpdateWorkTaskUsing = () => {
+      let editObj = {
+        createTime: "",
+        createUser: 0,
+        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+        updateTime: "",
+        updateUser: 0,
+        workEnclosureAddress: "",
+        workFlag: "",
+        workId: props.EditWorkId,
+        workName: formState.workName,
+        workRequirement: formState.workRequirement,
+        workTag: "",
+      };
+      updateWorkTaskUsing(editObj)
+        .then((res) => {
+          console.log(res);
+          if (props.isLevel) {
+            // 如果是关卡页面进入 ---------------------------------
+            myRouterEditTask(res.data.data.workId);
+          } else {
+            myProjectEditTask(res.data.data.workId);
+          }
+        })
+        .catch((err) => {
+          message.error(`编辑失败${err}`);
+        });
+    };
+    // 查询任务
+    const queryWork = () => {
+      state.addLoading = true;
+      queryWorkDetailById({ workId: props.EditWorkId })
+        .then((res) => {
+          console.log(
+            dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD")
+          );
+          formState.workName = res.data.data.workName;
+          formState.workRequirement = res.data.data.workRequirement;
+          formState.choosedTime = [
+            dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.submitEndTime, "YYYY-MM-DD"),
+          ];
+          console.log(res);
+          state.addLoading = false;
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
+    };
+    // 新增编辑或新增项目任务
+    const myProjectEditTask = (workId) => {
+      let editObj = {
+        courseId: workId,
+        duration: 60,
+        flag: true,
+        name: formState.workName,
+        projectId: props.projectId,
+        projectTaskId: props.projectTaskId || 0,
+        stageId: props.chooseStageId,
+        type: 4,
+      };
+      ProjectEditTask(editObj)
+        .then((res) => {
           console.log(` 编辑项目成功的打印 ${res}`);
-          message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
+          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
           ctx.emit("changeData", false);
           state.addLoading = false;
           closeDrawer();
-        }).catch(err => {
-          message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
-          console.log(` 编辑项目失败的打印 ${err}`);
         })
+        .catch((err) => {
+          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          console.log(` 编辑项目失败的打印 ${err}`);
+        });
+    };
+    // 新增编辑或新增关卡任务
+    const myRouterEditTask = (testId) => {
+      let editObj1 = {
+        chapterId: props.isactive,
+        courseId: testId,
+        duration: 30,
+        flag: true,
+        name: formState.workName,
+        routerId: props.routerId,
+        routerTaskId: props.routerTaskId || 0,
+        type: 4,
+      };
 
-        }
-        // 新增编辑或新增关卡任务
-        const myRouterEditTask = (testId) => {
-          let editObj1 = {
-            "chapterId": props.isactive,
-            "courseId": testId,
-            "duration": 30,
-            "flag": true,
-            "name": formState.workName,
-            "routerId": props.routerId,
-            "routerTaskId":  props.routerTaskId || 0,
-            "type": 4
-          }
-
-          RouterEditTask(editObj1).then(res => {
-            console.log(` 编辑关卡成功的打印 ${res}`);
-            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-            ctx.emit("changeData", false);
-            state.addLoading = false;
-            closeDrawer();
-          }).catch(err => {
-            message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
-            console.log(` 编辑关卡失败的打印 ${err}`);
-          })
-        }
+      RouterEditTask(editObj1)
+        .then((res) => {
+          console.log(` 编辑关卡成功的打印 ${res}`);
+          message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          ctx.emit("changeData", false);
+          state.addLoading = false;
+          closeDrawer();
+        })
+        .catch((err) => {
+          message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          console.log(` 编辑关卡失败的打印 ${err}`);
+        });
+    };
 
     return {
       afterVisibleChange,
@@ -383,7 +447,7 @@ export default {
       // layout,
       rules,
       updateWork,
-      ...toRefs(state)
+      ...toRefs(state),
     };
   },
 };
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4ca4884a..ebaf0cb1 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -961,45 +961,49 @@
               <div class="set_content">
                 <div class="setc_name"><span>项目名称：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">管理者进阶 - 管理者腾飞班</span>
+                  <span style="color: #999999">{{ name }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>封面图：</span></div>
                 <div class="setc_main">
-                  <img src="@/assets/images/projectadd/picture.png" alt="" />
+                  <img
+                    style="width: 151px; height: 84px;"
+                    :src="picUrl"
+                    alt=""
+                  />
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目时间：</span></div>
                 <div class="setc_main">
                   <span style="color: #999999"
-                    >2022-7-16 12:30 ～ 2022-7-30 12:30</span
+                    >{{ startTime }} ～ {{ endTime }}</span
                   >
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目经理：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">张雪</span>
+                  <span style="color: #999999">{{ manager }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>资源归属：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ sourceBelong }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目说明：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ remark }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>同步学习记录：</span></div>
-                <div class="setc_main" @click="changecheck2">
-                  <a-radio v-model:checked="checkedd"
+                <div class="setc_main">
+                  <a-radio v-model:checked="checkedSty"
                     ><span style="color: #333333"
                       >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                     ></a-radio
@@ -1009,19 +1013,19 @@
               <div class="set_content">
                 <div class="setc_name"><span>项目级别：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ level }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>培训体系：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <span style="color: #999999">{{ systemId }}</span>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>是否BOEU实施：</span></div>
-                <div class="setc_main" @click="changecheck3">
-                  <a-radio v-model:checked="checkedd2"
+                <div class="setc_main">
+                  <a-radio v-model:checked="checkedBOEU"
                     ><span style="color: #333333">BOEU实施</span></a-radio
                   >
                 </div>
@@ -1706,6 +1710,8 @@ import * as api from "../../api/index1";
 import { getProjStu, deleteStu } from "../../api/indexProjStu";
 import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
+import { getTask } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
 export default {
   name: "taskPage",
   components: {
@@ -1846,8 +1852,8 @@ export default {
       checked: false,
       checked1: true,
       checked2: false,
-      checkedd: false, //设置按钮1
-      checkedd2: false, //设置按钮2
+      checkedSty: false, //同步学习记录
+      checkedBOEU: false, //是否BOEU实施
       radioV1: "",
       radioV2: "",
       activeKey: "5", //1:概览 2.任务...
@@ -2324,6 +2330,18 @@ export default {
       rankStartTime: null,
       rankEndTime: null,
       valueName: "", //排行榜输入姓名
+
+      //设置
+      name: null, //项目名称
+      startTime: null, //开始时间
+      endTime: null, //结束时间
+      manager: null, //项目经理
+      sourceBelong: null, //资源归属
+      remark: null, //项目说明
+      level: null, //项目级别
+      systemId: null, //培训体系
+      picUrl: null,
+
     });
 
     // 输入接入 -- start --
@@ -2524,12 +2542,7 @@ export default {
     const showChangeGroup = () => {
       state.Changevisible = true;
     };
-    const changecheck2 = () => {
-      state.checkedd = !state.checkedd;
-    };
-    const changecheck3 = () => {
-      state.checkedd2 = !state.checkedd2;
-    };
+
     const edit_hShow = () => {
       state.edit_hs = true;
     };
@@ -2992,6 +3005,45 @@ export default {
     onMounted(() => {
       getStu();
       getTaskList();
+      getTask({
+        projectId: state.projectId,
+      }).then((res) => {
+        console.log("get task", res.data.data);
+        let info = res.data.data.projectInfo;
+        let start = toDate(info.beginTime / 1000, "Y-M-D");
+        let end = toDate(info.endTime / 1000, "Y-M-D");
+
+        state.name = info.name;
+        state.startTime = start;
+        state.endTime = end;
+        state.manager = info.manager;
+        state.sourceBelongId = info.sourceBelongId;
+        state.remark = info.remark;
+        state.level =
+          info.level == 1
+            ? "集团级"
+            : info.level == 2
+            ? "组织级"
+            : info.level == 3
+            ? "现地级"
+            : info.level == 4
+            ? "部门级"
+            : "-";
+        state.systemId =
+          info.systemId == 1
+            ? "集团级"
+            : info.systemId == 2
+            ? "组织级"
+            : info.systemId == 3
+            ? "现地级"
+            : info.systemId == 4
+            ? "部门级"
+            : "-";
+        state.checkedSty = info.courseSyncFlag == 1 ? true : false;
+        state.checkedBOEU = info.boeFlag == 1 ? true : false;
+        state.picUrl = info.picUrl;
+        state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-"
+      });
     });
     return {
       ...toRefs(state),
@@ -3017,8 +3069,6 @@ export default {
       showAA,
       showWork,
       showTest,
-      changecheck2,
-      changecheck3,
       showStuAdd,
       showImportStu,
       showSeeStu,

From 2d2e974277edf69323ef4efe3bd1b5eba4fc1c9a Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 9 Nov 2022 12:00:40 +0800
Subject: [PATCH 11/90] =?UTF-8?q?feat:=E6=8A=95=E7=A5=A8=E6=96=B0=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=88=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=B2=A1=E5=81=9A=EF=BC=8C=E5=88=A0=E9=99=A4=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddVote.vue |   2 +-
 src/components/drawers/CreVote.vue | 219 ++++++++++++++++++++---------
 2 files changed, 156 insertions(+), 65 deletions(-)

diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index d13fe14e..57195b43 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -27,7 +27,7 @@
                   alt=""
                 />
               </div>
-              <span style="margin-right: 3px">投票名称：</span>
+              <span style="margin-right: 3px">任务名称：</span>
             </div>
             <div class="btnbox">
               <a-input
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 9722df81..9a2d01e7 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -36,6 +36,10 @@
           <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">
@@ -44,7 +48,9 @@
                   alt=""
                 />
               </div>
-              <span style="margin-right: 3px">题干</span>
+              <span style="margin-right: 3px"
+                >{{ q.stemTit }}{{ index + 1 }}</span
+              >
             </div>
             <div class="btnbox">
               <a-input
@@ -55,7 +61,7 @@
             </div>
           </div>
           <div class="option" v-for="(o, index) in q.options" :key="index">
-            <div class="main_item">
+            <div class="mainoptions">
               <div class="signbox">
                 <div class="sign">
                   <img
@@ -63,24 +69,29 @@
                     alt=""
                   />
                 </div>
-                <span style="margin-right: 3px">{{ o.title }}</span>
+                <span style="margin-right: 3px">{{ o.title }}{{index+1}}</span>
               </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="o.opvalue"
-                  style="width: 424px; height: 32px"
-                />
-                <a-button v-if="o.opvalue == ''" type="link"
-                  >+ 上传图片</a-button
-                >
-                <a-button v-else type="link">删除</a-button>
+              <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 v-if="o.opvalue == ''" 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" @click="addOpt(q.options)">
-              <div class="tjxxbtn"><div class="btntext">添加选项</div></div>
+            <div class="btnbox">
+              <div class="tjxxbtn" @click="addOpt(q.options)">
+                <div class="btntext">添加选项</div>
+              </div>
             </div>
           </div>
         </div>
@@ -112,14 +123,15 @@ export default {
       creVote: true,
       questions: [
         {
+          stemTit: "题干",
           inputV: "",
           options: [
             {
-              title: "选项1",
+              title: "选项",
               opvalue: "",
             },
             {
-              title: "选项2",
+              title: "选项",
               opvalue: "",
             },
           ],
@@ -129,14 +141,15 @@ export default {
 
     const addQue = () => {
       state.questions.push({
+        stemTit: "题干",
         inputV: "",
         options: [
           {
-            title: "选项1",
+            title: "选项",
             opvalue: "",
           },
           {
-            title: "选项2",
+            title: "选项",
             opvalue: "",
           },
         ],
@@ -145,10 +158,16 @@ export default {
     const addOpt = (value) => {
       console.log(value);
       value.push({
-        title: "选项" + (value.length + 1 * 1),
+        // 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);
@@ -171,7 +190,7 @@ export default {
       //   message.destroy();
       //   return message.info("请输入选项");
       // }
-      console.log('111111',state.questions);
+      console.log("111111", state.questions);
       // console.log('22222',state.questions.inputV);
       // console.log('333333',state.questions.options);
       let obj = [
@@ -207,11 +226,11 @@ 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) => {
@@ -240,6 +259,7 @@ export default {
       closeDrawer,
       addQue,
       addOpt,
+      delOpt,
       createQueTit,
     };
   },
@@ -291,6 +311,7 @@ export default {
           display: flex;
           justify-content: end;
           align-items: center;
+          margin-right: 5px;
           .sign {
             margin-right: 5px;
           }
@@ -299,24 +320,9 @@ export default {
           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 {
+      .mainoptions {
         display: flex;
         align-items: flex-start;
         margin-bottom: 32px;
@@ -325,43 +331,128 @@ export default {
           display: flex;
           justify-content: end;
           align-items: center;
+          padding-top: 5px;
+          margin-right: 5px;
           .sign {
             margin-right: 5px;
           }
         }
-        .kqszbox {
-          .qdqtbox {
-            margin-left: 56px;
-          }
-          .setbox {
+        .optionbox {
+          .btnbox {
             display: flex;
-            flex-wrap: wrap;
-            margin-top: 10px;
-            margin-bottom: 24px;
-            .timerbox {
-              margin-top: 6px;
-              margin-right: 32px;
+            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;
-              flex-wrap: nowrap;
+              justify-content: center;
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              .btntext {
+                color: #fff;
+              }
             }
           }
         }
-        .btnbox2 {
+        .main_item2 {
           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;
+          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;
+            }
           }
         }
       }

From 7a12224e28868305302e26f040de277ac6f6556e Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Wed, 9 Nov 2022 15:08:44 +0800
Subject: [PATCH 12/90] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E7=AE=A1=E7=90=86=E8=8E=B7=E5=8F=96=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                      |  6 +++++-
 src/components/drawers/CreVote.vue    |  2 +-
 src/components/drawers/FaceManage.vue | 31 +++++++++++++++++++++++++++
 src/components/drawers/TestManage.vue |  4 ++++
 src/components/drawers/TimeManage.vue |  4 ++++
 src/components/drawers/WorkManage.vue |  4 ++++
 src/views/projectcenter/TaskPage.vue  | 20 ++++++++++-------
 7 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 994fc519..2ccc90d6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -58,7 +58,11 @@ export const releaseProject=(obj)=>http.post('/admin/project/publish',obj)
 //获取项目学员
 export const projectStudent=(obj)=>http.post('/admin/project/studentList',obj)
 //撤回发布、结束
-export const handleProject=(obj)=>http.post('/admin/project/handle',obj)
+export const handleProject = (obj) => http.post('/admin/project/handle', obj)
+
+//获取任务管理列表
+export const taskStudentList = (obj) => http.post('/admin/project/taskStudentList', obj)
+
 
 
 
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 9a2d01e7..cdcd309d 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -81,7 +81,7 @@
                     删除
                   </button>
                 </div>
-                <a-button v-if="o.opvalue == ''" type="link">+ 上传图片</a-button>
+                <a-button type="link">+ 上传图片</a-button>
                 <!-- <input class="file-upload" type="file" accept="image/*" name="picture"/> -->
               </div>
             </div>
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 48960ef2..cdb61889 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -149,6 +149,7 @@
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import EntryScores from "./EntryScores.vue";
+import * as api from "../../api/index";
 export default {
   name: "FaceManage",
   components: { EntryScores },
@@ -157,6 +158,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    ProjectTaskId: {
+      type: Number,
+      default: null,
+    },
   },
 
   setup(props, ctx) {
@@ -359,8 +364,33 @@ export default {
     const showopen = () => {
       state.open = true;
     };
+
+    //获取任务管理列表
+    const getManageList = () => {
+      let obj = {
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.ProjectTaskId,
+        status: 0,
+      };
+      console.log('9999999999999',obj.projectTaskId);
+      api
+        .taskStudentList(obj)
+        .then((res) => {
+          console.log('获取任务管理列表成功', res);
+          
+        })
+        .catch((err) => {
+        console.log("获取任务列表失败",err)
+      })
+    };
+
     let timer;
     onMounted(() => {
+      setTimeout(() => {
+        getManageList()
+      },1000)
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
@@ -380,6 +410,7 @@ export default {
       showdoneModal,
       closedoneModal,
       showopen,
+      getManageList,
     };
   },
 };
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index a71722cc..072f1b21 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -119,6 +119,10 @@ export default {
       type: String,
       default: "",
     },
+    projectTaskId: {
+      type: Number,
+      default: null,
+    }
   },
 
   setup(props, ctx) {
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index e15764a2..b1661cda 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -115,6 +115,10 @@ export default {
       type: String,
       default: "",
     },
+    projectTaskId: {
+      type: Number,
+      default: null,
+    }
   },
 
   setup(props, ctx) {
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 9348356b..f8374472 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -134,6 +134,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    projectTaskId: {
+      type: Number,
+      default: null,
+    }
   },
 
   setup(props, ctx) {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4ca4884a..65062fd7 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -408,9 +408,9 @@
                             ? showTime(item.course, item.name)
                             : item.type == '5' || item.type == '10'
                             ? showTest(item.course, item.name)
-                            : item.type == '面授'
+                            : item.type == '2'
                             ? showFace(item.course)
-                            : item.type == '作业'
+                            : item.type == '4'
                             ? showWork(item.course)
                             : null
                         "
@@ -1032,9 +1032,9 @@
       </a-tabs>
     </div>
     <!-- 时间管理抽屉 -->
-    <time-manage v-model:Tvisible="visible" :title="showTimeText" />
+    <time-manage v-model:Tvisible="visible" :title="showTimeText" v-model:ProjectTaskId="projectTaskId"/>
     <!-- 面授管理抽屉 -->
-    <face-manage v-model:Fvisible="FaceVisivle" />
+    <face-manage v-model:Fvisible="FaceVisivle" v-model:ProjectTaskId="projectTaskId"/>
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
     <!-- 学员管理-添加学员抽屉 -->
@@ -1052,9 +1052,9 @@
     <!-- 活动考勤抽屉 -->
     <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
-    <work-manage v-model:Wvisible="Wvisible" />
+    <work-manage v-model:Wvisible="Wvisible" v-model:ProjectTaskId="projectTaskId"/>
     <!-- 考试管理抽屉 -->
-    <test-manage v-model:TMvisible="TMvisible" :title="showTestText" />
+    <test-manage v-model:TMvisible="TMvisible" :title="showTestText" v-model:ProjectTaskId="projectTaskId"/>
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
@@ -1806,6 +1806,7 @@ export default {
       selectedRowKeys: [], //选择的学员
       selectedRows: [], //选择的学员的id值
       chooseDeleteOne: [], //删除的单个学员id
+      projectTaskId:"", //项目任务id
       //进度排行学员
       rankjindu: [{ value: "学员", label: "学员" }],
       valuestu1: "学员",
@@ -2344,12 +2345,15 @@ export default {
           if (res.status == 200) {
             console.log("res", res);
             console.log("阶段列表", res.data.data.stageList);
+            console.log('任务id',res.data.data.stageList[0].taskList[0].projectTaskId)
+            //taskList[num] num应该是点那个就是那个数 
+            state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId 
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               //获取任务列表 阶段
               let taskarr = res.data.data.stageList;
               state.taskSyllabus = taskarr;
-              console.log(res.data.data.stageList[0].taskList[0].type, "ggg");
+              // console.log(res.data.data.stageList[0].taskList[0].type, "ggg");
             }
           }
         })
@@ -2979,7 +2983,7 @@ export default {
         topFlag: 0,
       };
       getProjStu(obj).then((res) => {
-        console.log(res.data.data.rows, "获取学员列表");
+        // console.log(res.data.data.rows, "获取学员列表");
         let leng = res.data.data.rows;
         state.total = res.data.data.total;
         if (leng > 0) {

From 20b057066120a96abef632ec0847e46de65b5bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Wed, 9 Nov 2022 16:07:52 +0800
Subject: [PATCH 13/90] =?UTF-8?q?feat:=20=E5=85=B3=E5=8D=A1=E6=A6=82?=
 =?UTF-8?q?=E8=A7=88=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexLearningPath.js        |   4 +
 src/views/learningpath/LevelAdd.vue | 122 ++++++++++++++++++++++------
 2 files changed, 101 insertions(+), 25 deletions(-)
 create mode 100644 src/api/indexLearningPath.js

diff --git a/src/api/indexLearningPath.js b/src/api/indexLearningPath.js
new file mode 100644
index 00000000..f32f7d01
--- /dev/null
+++ b/src/api/indexLearningPath.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+// 获取路径图概览
+export const getRouterOverview = (routerId) => http.get(`/admin/router/overview?routerId=${routerId}`)
\ No newline at end of file
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f5708800..1f6af2ad 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -116,43 +116,48 @@
             <div class="onerow"><div class="taskmain">项目概览</div></div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
-                <span class="nub1">200</span>
+                <span class="nub1">{{routerInfoOverview.totalStudentCnt}}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #ff90ae">15</span>
-                <div class="nub2">必修课</div>
+                <span class="nub1" style="color: #ff90ae">{{routerInfoOverview.studyStudentCnt}}</span>
+                <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #a497ff">15</span>
-                <div class="nub2">选修课</div>
+                <span class="nub1" style="color: #a497ff">{{routerInfoOverview.completeStudentCnt}}</span>
+                <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #5dc988">50</span
+                  <span class="nub1" style="color: #5dc988">{{routerInfoOverview.onlineCourseCnt}}</span
                   ><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">完成率</div>
+                <div class="nub2">在线课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #ff90ae">30</span
+                  <span class="nub1" style="color: #ff90ae">{{routerInfoOverview.offLineCourseCnt}}</span
                   ><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">必修完成率</div>
+                <div class="nub2">面授课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #a497ff">30</span
+                  <span class="nub1" style="color: #a497ff">{{routerInfoOverview.completeRatio}}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">选修完成率</div>
+                <div class="nub2">总完成率</div>
               </div>
             </div>
             <div class="onerow"><div class="taskmain">阶段信息</div></div>
             <div class="stagemess">
-              <div class="stage1">阶段1</div>
-              <div class="stage2">阶段2</div>
+              <div v-for="item in stageList" 
+              :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
+              :key="item.stageId" @click="choosedStageId = item.stageId">
+              {{item.stage}}
+            </div>
+              <!-- <div class="stage1">阶段1</div>
+              <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
               <div class="staname">阶段名称：</div>
@@ -163,7 +168,7 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="chapterOverviewList.completeCourseRatio"
                   :width="140"
                 />
                 <div class="protext">课程完成率</div>
@@ -172,7 +177,7 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="chapterOverviewList.completeExamRatio"
                   :width="140"
                 />
                 <div class="protext">考试通过率</div>
@@ -181,26 +186,26 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="chapterOverviewList.completeRatio"
                   :width="140"
                 />
-                <div class="protext">作业合格率</div>
+                <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
-                <div class="pronub" style="margin-left: 280px">10</div>
+                <div class="pronub" style="margin-left: 280px">{{chapterOverviewList.totalTaskCnt}}</div>
                 <div class="proright1">
-                  <span class="textpro">阶段任务总数</span>
-                  <a-progress :percent="50" style="width: 369px" />
+                  <span class="textpro">关卡任务总数</span>
+                  <a-progress :percent="chapterOverviewList.totalTaskCnt" style="width: 369px" />
                 </div>
-                <div class="pronub" style="margin-left: 206px">5</div>
+                <div class="pronub" style="margin-left: 206px">{{chapterOverviewList.totalReqCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress :percent="25" style="width: 369px" />
+                  <a-progress :percent="chapterOverviewList.totalReqCnt" style="width: 369px" />
                 </div>
-                <div class="pronub" style="margin-left: 142px">1</div>
+                <div class="pronub" style="margin-left: 142px">{{chapterOverviewList.totalOptCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress :percent="5" style="width: 369px" />
+                  <a-progress :percent="chapterOverviewList.totalOptCnt" style="width: 369px" />
                 </div>
               </div>
             </div>
@@ -883,10 +888,15 @@
       <!-- 作业管理抽屉 -->
       <work-manage v-model:Wvisible="Wvisible" />
     </div>
+    <!--  加载动画 -->
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="添加中..." />
+    </div>
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs } from "vue";
+import { ref, reactive, toRefs,onMounted } from "vue";
+import { message } from "ant-design-vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import CheckStu from "../../components/drawers/CheckStu";
@@ -901,6 +911,8 @@ import WorkManage from "../../components/drawers/WorkManage";
 import * as api from "../../api/index1";
 import { storage } from "../../api/storage";
 
+import { getRouterOverview } from "@/api/indexLearningPath";
+
 export default {
   name: "LevelAdd",
   components: {
@@ -926,6 +938,8 @@ export default {
       AddSvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
       CheckStuvisible: false, //学员管理的查看抽屉
+      addLoading:false, // 加载动画
+      choosedStageId:1, // 选择的阶段id
       twobtn: true,
       number: true,
       twobtnn: false,
@@ -1238,6 +1252,36 @@ export default {
         },
       ],
     });
+
+    const levelList = reactive({
+      routerInfoOverview:{ // 路径图整体数据概览
+        totalStudentCnt:0,
+        studyStudentCnt:0,
+        completeStudentCnt:0,
+        onlineCourseCnt:0,
+        offLineCourseCnt:0,
+        completeRatio:0,
+      },
+      chapterOverviewList:{ // 路径图阶段数据概览
+        completeCourseRatio:0,
+        completeExamRatio:0,
+        completeRatio:0,
+        totalTaskCnt:0,
+        totalReqCnt:0,
+        totalOptCnt:0,
+      },
+      stageList: [ // 阶段列表
+        {
+          stageId:1,
+          stage:"阶段一"
+        },
+        {
+          stageId:2,
+          stage:"阶段二"
+        }
+      ]
+    })
+
     // console.log("store", state.routerId);
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -1475,8 +1519,36 @@ export default {
     };
 
     //学员管理------------------------------------------------
+
+    onMounted(() => {
+      state.addLoading = true;
+      getOverview()
+    })
+
+    // 获取项目概览
+    const getOverview = () =>{
+      getRouterOverview(state.routerId).then((res) => {
+        Object.keys(res.data.data.routerInfoOverview).forEach(item => {
+          levelList.routerInfoOverview[item] = res.data.data.routerInfoOverview[item] || 0
+        })
+        Object.keys(res.data.data.chapterOverviewList).forEach(item => {
+          levelList.chapterOverviewList[item] = res.data.data.chapterOverviewList[item] || 0
+        })
+        // res.data.data.routerInfoOverview.forEach((r) => {
+        //   console.log(r)
+        // })
+        state.addLoading = false;
+        console.log("项目概览--"+res)
+      }).catch(err => {
+        state.addLoading = false;
+        message.error("概览获取失败")
+        console.log("获取失败"+err)
+      })
+    }
+
     return {
       ...toRefs(state),
+      ...toRefs(levelList),
       selectProjectName,
       selectProjectName2,
       selectProjectName3,

From e28a948e1544759b4bf86445b22ab796e7894fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Wed, 9 Nov 2022 16:59:27 +0800
Subject: [PATCH 14/90] =?UTF-8?q?feat=EF=BC=9A=E5=85=B3=E5=8D=A1=E4=B8=8B?=
 =?UTF-8?q?=20=E8=B7=AF=E5=BE=84=E7=AE=A1=E7=90=86=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 85 ++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 1f6af2ad..68b38c7b 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -306,11 +306,11 @@
                 <a-collapse-panel
                   v-for="(value, index) in taskSyllabus"
                   :key="index"
-                  :header="value.text"
+                  :header="value.name"
                 >
                   <div
                     class="course"
-                    v-for="(item, key) in value.children"
+                    v-for="(item, key) in value.taskList"
                     :key="key"
                   >
                     <!-- :style="{width:item.course==='在线'?'28px':
@@ -328,29 +328,29 @@
                         >
                           <img
                             :src="
-                              item.course === '在线'
+                              item.type === 1
                                 ? require('../../assets/images/leveladd/zai.png')
-                                : item.course === '面授'
+                                : type === 2
                                 ? require('../../assets/images/leveladd/mian.png')
-                                : item.course === '案例'
+                                : item.type === 3
                                 ? require('../../assets/images/leveladd/an.png')
-                                : item.course === '作业'
+                                : item.type === 4
                                 ? require('../../assets/images/leveladd/zuo.png')
-                                : item.course === '考试'
+                                : item.type === 5
                                 ? require('../../assets/images/leveladd/kao.png')
-                                : item.course === '直播'
+                                : item.type === 6
                                 ? require('../../assets/images/leveladd/zhi.png')
-                                : item.course === '外链'
+                                : item.type === 7
                                 ? require('../../assets/images/leveladd/wai.png')
-                                : item.course === '讨论'
+                                : item.type === 8
                                 ? require('../../assets/images/leveladd/tao.png')
-                                : item.course === '活动'
+                                : item.type === 9
                                 ? require('../../assets/images/leveladd/huo.png')
-                                : item.course === '测评'
+                                : item.type === 10
                                 ? require('../../assets/images/leveladd/ce.png')
-                                : item.course === '评估'
+                                : item.type === 11
                                 ? require('../../assets/images/leveladd/diao.png')
-                                : item.course === '投票'
+                                : item.type === 12
                                 ? require('../../assets/images/leveladd/tou.png')
                                 : null
                             "
@@ -358,17 +358,17 @@
                         </div>
                       </div>
                       <div>
-                        <div class="iconame">「{{ item.course }}」</div>
+                        <div class="iconame">「{{checkType(item.type)}}」</div>
                         <div class="icontext">{{ item.name }}</div>
                       </div>
                     </div>
                     <div class="type">
                       <div
                         :class="
-                          item.classify == '必修' ? 'typename1' : 'typename'
+                          item.flag ? 'typename1' : 'typename'
                         "
                       >
-                        {{ item.classify }}
+                        {{ item.flag ? "必修" : "选修" }}
                       </div>
                     </div>
                     <div class="time">
@@ -912,6 +912,7 @@ import * as api from "../../api/index1";
 import { storage } from "../../api/storage";
 
 import { getRouterOverview } from "@/api/indexLearningPath";
+import { GetRouterDetail } from "@/api/indexTask";
 
 export default {
   name: "LevelAdd",
@@ -1023,8 +1024,8 @@ export default {
       //任务大纲列表
       taskSyllabus: [
         {
-          text: "关卡1  初级产品经理",
-          children: [
+          name: "关卡1  初级产品经理",
+          taskList: [
             {
               course: "在线",
               name: "时间管理",
@@ -1082,8 +1083,8 @@ export default {
           ],
         },
         {
-          text: "关卡2  中级产品经理",
-          children: [
+          name: "关卡2  中级产品经理",
+          taskList: [
             {
               course: "讨论",
               name: "时间管理",
@@ -1495,6 +1496,9 @@ export default {
 
     const changeTabs = (e) => {
       console.log("切换tabs", e, state.routerId);
+      if(e == 2) {
+        myGetRouterDetail()
+      }
       //学员管理
       if (e == 3) {
         getStudent();
@@ -1518,6 +1522,26 @@ export default {
         });
     };
 
+    
+  const checkType = (type) => {
+    let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
+      ];
+      return typeRules[type];
+  }
+
     //学员管理------------------------------------------------
 
     onMounted(() => {
@@ -1545,6 +1569,24 @@ export default {
         console.log("获取失败"+err)
       })
     }
+    // 获取路径列表
+    const myGetRouterDetail = () => {
+      GetRouterDetail(state.routerId).then(res => {
+        let data = res.data.data.chapterList
+        // state.taskSyllabus = data
+        for(let i in data) {
+          state.taskSyllabus[i].name = data[i].name
+          for(let j in data[i].taskList) {
+            Object.keys(data[i].taskList[j]).forEach(item => {
+            state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
+        })
+          }
+        }
+      }).catch(err => {
+        message.error('获取路径列表失败'+err);
+      })
+
+    }
 
     return {
       ...toRefs(state),
@@ -1577,6 +1619,7 @@ export default {
       closehuodModal,
       closezhibModal,
       changeTabs,
+      checkType,
     };
   },
 };

From 972efbdd5786b59b21c05fdbb927be8cefada68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Thu, 10 Nov 2022 15:31:53 +0800
Subject: [PATCH 15/90] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=85=B3?=
 =?UTF-8?q?=E5=8D=A1=E4=B8=8B=E7=9A=84=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=EF=BC=88=E9=9D=99=E6=80=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 368 +++++++++++++++++-----------
 1 file changed, 225 insertions(+), 143 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 68b38c7b..d94cb66d 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -553,165 +553,213 @@
         </a-tab-pane>
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
-          <div class="sametab">
-            <div class="Gcon">
-              <div class="pad"></div>
-              <div class="Gin">
-                <div class="headone">
-                  <div class="box"></div>
-                  <div class="onetitle">关卡内容可见可学设置</div>
-                  <div class="oneedi" @click="showbtn" v-show="twobtn">
-                    编辑
-                  </div>
-                  <div v-show="twobtnn" class="twobtn">
-                    <div class="btnone" @click="closebtn">取消</div>
-                    <div class="btntwo" @click="closebtn">确定</div>
-                  </div>
-                </div>
-                <div class="onemain clearfix">
-                  <div class="checkcon">
-                    <input
-                      type="checkbox"
-                      name="cb1"
-                      value="yulan"
-                      class="in"
-                    />
-                    <span class="yulan">预览其他关卡</span><br />
-                    <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex; align-items: center">
-                      <span class="yulan2">学员可预览第</span>
-                      <span style="color: #4ea6ff" v-show="number">1</span>
-                      <a-input-number
-                        v-model:value="nubvalue"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
-                      />
-                      <span>关-第</span
-                      ><span style="color: #4ea6ff" v-show="number">4</span>
-                      <a-input-number
-                        v-model:value="nubvalue1"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
-                      />
-                      <span>关内容</span>
+
+          <a-tabs>
+            <a-tab-pane key="1" tab="基本信息">
+            <div class="sametab">
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">关卡内容可见可学设置</div>
+                    <div class="oneedi" @click="showbtn" v-show="twobtn">
+                      编辑
+                    </div>
+                    <div v-show="twobtnn" class="twobtn">
+                      <div class="btnone" @click="closebtn">取消</div>
+                      <div class="btntwo" @click="closebtn">确定</div>
                     </div>
                   </div>
-                  <div class="checkcon" style="margin-top: 20px">
-                    <input
-                      type="checkbox"
-                      name="cb1"
-                      value="xuexi"
-                      class="in"
-                    />
-                    <span class="yulan">学习其他关卡</span><br />
-                    <div style="width: 10px; height: 4px"></div>
-                    <div style="display: flex; align-items: center">
-                      <span class="yulan2">学员可预览第</span>
-                      <span style="color: #4ea6ff" v-show="number">1</span>
-                      <a-input-number
-                        v-model:value="nubvalue2"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
+                  <div class="onemain clearfix">
+                    <div class="checkcon">
+                      <input
+                        type="checkbox"
+                        name="cb1"
+                        value="yulan"
+                        class="in"
                       />
-                      <span>关-第</span
-                      ><span style="color: #4ea6ff" v-show="number">4</span>
-                      <a-input-number
-                        v-model:value="nubvalue3"
-                        v-show="inputbox"
-                        :controls="false"
-                        :autofocus="true"
-                        :min="1"
-                      />
-                      <span>关内容</span>
+                      <span class="yulan">预览其他关卡</span><br />
+                      <div style="width: 10px; height: 4px"></div>
+                      <div style="display: flex; align-items: center">
+                        <span class="yulan2">学员可预览第</span>
+                        <span style="color: #4ea6ff" v-show="number">1</span>
+                        <a-input-number
+                          v-model:value="nubvalue"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关-第</span
+                        ><span style="color: #4ea6ff" v-show="number">4</span>
+                        <a-input-number
+                          v-model:value="nubvalue1"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关内容</span>
+                      </div>
                     </div>
+                    <div class="checkcon" style="margin-top: 20px">
+                      <input
+                        type="checkbox"
+                        name="cb1"
+                        value="xuexi"
+                        class="in"
+                      />
+                      <span class="yulan">学习其他关卡</span><br />
+                      <div style="width: 10px; height: 4px"></div>
+                      <div style="display: flex; align-items: center">
+                        <span class="yulan2">学员可预览第</span>
+                        <span style="color: #4ea6ff" v-show="number">1</span>
+                        <a-input-number
+                          v-model:value="nubvalue2"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关-第</span
+                        ><span style="color: #4ea6ff" v-show="number">4</span>
+                        <a-input-number
+                          v-model:value="nubvalue3"
+                          v-show="inputbox"
+                          :controls="false"
+                          :autofocus="true"
+                          :min="1"
+                        />
+                        <span>关内容</span>
+                      </div>
+                    </div>
+                    <br />
                   </div>
-                  <br />
                 </div>
               </div>
-            </div>
-            <div class="Gcon">
-              <div class="pad"></div>
-              <div class="Gin" style="margin-top: 0px">
-                <div class="headone">
-                  <div class="box"></div>
-                  <div class="onetitle">关卡晋级规则</div>
-                </div>
-                <div class="twomain clearfix">
-                  <a-switch
-                    size="small"
-                    v-model:checked="checked2"
-                    style="margin-top: -5px"
-                  />
-                  <span class="info">启用关卡自动规则加入</span>
-                  <div class="infor">
-                    若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin" style="margin-top: 0px">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">关卡晋级规则</div>
                   </div>
-                  <div :class="[checked2 ? 'chooseshow' : 'choo']">
-                    <div class="fane">选择范围</div>
-                    <div class="select">
-                      <a-select
-                        v-model:value="projectName"
-                        style="
-                          width: 250px;
-                          border-radius: 8px;
-                          margin-top: 15px;
-                        "
-                        placeholder="请选择部门"
-                        :options="projectNameList"
-                        @change="selectProjectName3"
-                        allowClear
-                        showSearch
-                      ></a-select>
+                  <div class="twomain clearfix">
+                    <a-switch
+                      size="small"
+                      v-model:checked="checked2"
+                      style="margin-top: -5px"
+                    />
+                    <span class="info">启用关卡自动规则加入</span>
+                    <div class="infor">
+                      若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
                     </div>
-                    <div class="select">
-                      <a-select
-                        v-model:value="projectName2"
-                        style="
-                          width: 250px;
-                          border-radius: 8px;
-                          margin-top: 15px;
-                        "
-                        placeholder="请选择岗位"
-                        :options="projectNameList2"
-                        @change="selectProjectName2"
-                        allowClear
-                        showSearch
-                      ></a-select>
-                    </div>
-                  </div>
-                  <div class="btm">
-                    <div class="bmo">关卡学习方案展示设置</div>
-                    <div class="bmt">仅支持移动端</div>
-                    <div class="chosecon">
-                      <div class="chose">
-                        <input
-                          type="checkbox"
-                          name="cb1"
-                          value="lieb"
-                          class="inl"
-                        /><span class="sh">列表展示</span>
+                    <div :class="[checked2 ? 'chooseshow' : 'choo']">
+                      <div class="fane">选择范围</div>
+                      <div class="select">
+                        <a-select
+                          v-model:value="projectName"
+                          style="
+                            width: 250px;
+                            border-radius: 8px;
+                            margin-top: 15px;
+                          "
+                          placeholder="请选择部门"
+                          :options="projectNameList"
+                          @change="selectProjectName3"
+                          allowClear
+                          showSearch
+                        ></a-select>
                       </div>
-                      <div class="chose" style="margin-left: 20px">
-                        <input
-                          type="checkbox"
-                          name="cb1"
-                          value="lieb"
-                          class="inl"
-                        /><span class="sh">路径展示</span>
+                      <div class="select">
+                        <a-select
+                          v-model:value="projectName2"
+                          style="
+                            width: 250px;
+                            border-radius: 8px;
+                            margin-top: 15px;
+                          "
+                          placeholder="请选择岗位"
+                          :options="projectNameList2"
+                          @change="selectProjectName2"
+                          allowClear
+                          showSearch
+                        ></a-select>
+                      </div>
+                    </div>
+                    <div class="btm">
+                      <div class="bmo">关卡学习方案展示设置</div>
+                      <div class="bmt">仅支持移动端</div>
+                      <div class="chosecon">
+                        <div class="chose">
+                          <input
+                            type="checkbox"
+                            name="cb1"
+                            value="lieb"
+                            class="inl"
+                          /><span class="sh">列表展示</span>
+                        </div>
+                        <div class="chose" style="margin-left: 20px">
+                          <input
+                            type="checkbox"
+                            name="cb1"
+                            value="lieb"
+                            class="inl"
+                          /><span class="sh">路径展示</span>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div></a-tab-pane
-        >
+          </a-tab-pane>
+
+          <a-tab-pane key="2" tab="共享文档">
+            <div class="sametab">
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">上传共享文档</div>
+                    <div class="oneedi">
+                      <a-switch v-model:checked="docChecked" ></a-switch>
+                    </div>
+                  </div>
+                  <div class="btnbox" style="margin:20px;">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
+                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
+                  width:34px;height:34px;
+                  " alt="">
+                </a-upload>
+                <div class="btnbox" style="margin:20px;">
+                <span style="color: #999999">
+                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                </span>
+              </div>
+              <div v-for="item in docList" :key="item.src" class="docListStyle">
+                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
+                  width:40px;height:40px;margin-right:40px;
+                  " alt="">
+                <span style="font: oblique bold  16px Sans-serif">{{item.name}}</span> 
+                <span style="color: #4ea6ff;float:right;">删除</span>
+              </div>
+              </div>
+                </div>
+              </div>
+            </div>
+          </a-tab-pane>
+
+          </a-tabs>
+          </a-tab-pane>
       </a-tabs>
       <a-modal
         style="padding: 0"
@@ -946,6 +994,20 @@ export default {
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      docList:[
+        {
+          name:'测试文档1.doc',
+          src:"",
+        },
+        {
+          name:'测试文档2.doc',
+          src:"",
+        },
+        {
+          name:'测试文档3.doc',
+          src:"",
+        }
+      ], // 共享文档列表
       huodModal: false,
       zhibModal: false,
       projectNameListt: [
@@ -1130,7 +1192,9 @@ export default {
       nubvalue2: ref("1"),
       nubvalue3: ref("4"),
       nubvalue1: ref("4"),
+      fileList:ref([]),
       checked2: false,
+      docChecked:true,
       currentPage: 1,
       tableDataTotal: 100,
       pageSize: 10,
@@ -1588,6 +1652,18 @@ export default {
 
     }
 
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
+        console.log(info.file, info.fileList);
+      }
+
+      if (info.file.status === "done") {
+        message.success(`${info.file.name} 文件上传成功`);
+      } else if (info.file.status === "error") {
+        message.error(`${info.file.name} 文件上传失败.`);
+      }
+    };
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -1620,6 +1696,7 @@ export default {
       closezhibModal,
       changeTabs,
       checkType,
+      handleChange
     };
   },
 };
@@ -1705,6 +1782,11 @@ export default {
                 color: #666666;
               }
             }
+            .docListStyle {
+              display: flex;
+              width: 300px !important;
+              justify-content: space-around;
+            }
             .del_btnbox {
               display: flex;
               margin: 30px auto;

From 9fe983b9b9ff2dad180f3ce9f95b9007e27f58fa Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Thu, 10 Nov 2022 15:55:07 +0800
Subject: [PATCH 16/90] =?UTF-8?q?feat:=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E7=AE=A1=E7=90=86=E5=A2=9E=E5=88=A0=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js              |  11 +-
 src/components/Modals/projSet.vue    | 457 ++++++++++++++
 src/components/drawers/StuAdd.vue    | 790 +++++++++++++----------
 src/views/projectcenter/TaskAdd.vue  |  11 +-
 src/views/projectcenter/TaskPage.vue | 905 +++++++--------------------
 5 files changed, 1178 insertions(+), 996 deletions(-)
 create mode 100644 src/components/Modals/projSet.vue

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 0dc883a6..b28fa230 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -4,4 +4,13 @@ import http from "./config";
 export const getProjStu = (obj) => http.post('/admin/project/studentList', obj)
 
 //删除学员
-export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)
\ No newline at end of file
+export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj)
+
+//获取小组列表
+export const getGroupList = (obj) => http.post('/admin/project/groupList', obj)
+
+//删除小组
+export const deleteGroup = (obj) => http.delete('/admin/project/deleteGroup', { params: obj })
+
+//新增或编辑小组
+export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
\ No newline at end of file
diff --git a/src/components/Modals/projSet.vue b/src/components/Modals/projSet.vue
new file mode 100644
index 00000000..d41a38c6
--- /dev/null
+++ b/src/components/Modals/projSet.vue
@@ -0,0 +1,457 @@
+<template>
+  <!-- 编辑弹窗 -->
+  <div>
+    <a-modal
+      :visible="editHs"
+      :title="null"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="set_edit"
+      width="679px"
+      @cancel="edit_exit"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div class="headerLeft" style="margin-left: 32px">
+          <span style="width: 15px; height: 15px"
+            ><img src="../../assets/images/taskpage/edit.png"
+          /></span>
+          <span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >编辑</span
+          >
+        </div>
+        <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close.png"
+          />
+        </div>
+      </div>
+      <div class="modalMain">
+        <div class="projectname">基本信息</div>
+        <div class="setbody">
+          <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="projectName"
+                style="width: 424px; height: 32px"
+                placeholder="请输入项目名称"
+                maxlength="20"
+              />
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">直播封面：</span>
+            </div>
+            <div class="lodalimg">
+              <div class="lodalcenter">
+                <span style="color: #448ef7; margin-right: 10px">+</span>
+                <span style="color: #448ef7">添加图片</span>
+              </div>
+            </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">项目时间：</span>
+            </div>
+            <div class="btnbox">
+              <a-range-picker
+                style="width: 424px"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
+            </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">项目经理：</span>
+            </div>
+            <div class="btnbox">
+              <a-select
+                dropdownClassName="dropdown-style"
+                style="width: 424px"
+                placeholder="请选择项目经理"
+                :options="options1"
+                allowClear
+                showSearch
+              />
+            </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">资源归属：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="自动带出 可修改"
+                maxlength="20"
+              />
+            </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 class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">同步学习记录：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group v-model:value="radioV1">
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自由免修改课程）
+                </a-radio>
+              </a-radio-group>
+            </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">项目级别：</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 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 style="margin-right: 3px">是否BOEU实施：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group v-model:value="radioV2">
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
+                  >BOEU实施</a-radio
+                >
+              </a-radio-group>
+            </div>
+          </div>
+        </div>
+
+        <div class="pubtn">
+          <a-button class="pubtn1" @click="closeModal">取消</a-button>
+          <a-button class="pubtn2" @click="closeModal">发布</a-button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { reactive, toRefs } from "vue";
+// import {getTask} from "../../api/indexTaskadd"
+// import dayjs from "dayjs";
+// import {message} from "ant-design-vue"
+// import { toDate } from "@/api/method";
+
+export default {
+  name: "projSet",
+  props: {
+    editHs: {
+      type: Boolean,
+      default: false,
+    },
+    projectId: {
+      type: String,
+      default: null,
+    },
+  },
+  setup(props, ctx) {
+    //console.log("学习路径",props.isStudiscuss);
+    const state = reactive({});
+    const closeModal = () => {
+      ctx.emit("update:editHs", false);
+      console.log("projectId", props.projectId);
+    };
+    return {
+      ...toRefs(state),
+      closeModal,
+    };
+  },
+};
+</script>
+
+<style lang="scss" >
+.set_edit {
+  .ant-modal {
+    width: 866px !important;
+    height: 870px !important;
+
+    .ant-modal-body {
+      .modalHeader {
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
+      }
+
+      padding: 0;
+
+      .modalHeader {
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
+      }
+
+      .modalMain {
+        .projectname {
+          color: rgba(79, 81, 86, 1);
+          font-size: 14px;
+          line-height: 36px;
+          margin-left: 62px;
+          font-weight: 500;
+          margin-bottom: 24px;
+        }
+
+        .setbody {
+          margin-left: 67px;
+
+          .main_item {
+            display: flex;
+            align-items: center;
+            margin-bottom: 32px;
+
+            .signbox {
+              width: 130px;
+              display: flex;
+              justify-content: end;
+              align-items: center;
+              white-space: nowrap;
+
+              .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;
+              }
+            }
+          }
+
+          .main_item2 {
+            display: flex;
+            align-items: flex-start;
+            margin-bottom: 32px;
+
+            .signbox {
+              width: 130px;
+              display: flex;
+              justify-content: end;
+              align-items: center;
+              white-space: nowrap;
+
+              .sign {
+                margin-right: 5px;
+              }
+            }
+
+            .lodalimg {
+              width: 120px;
+              height: 120px;
+              border: 1px dashed #387df7;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              cursor: pointer;
+
+              .lodalimg {
+                display: flex;
+                white-space: nowrap;
+              }
+            }
+
+            .kqszbox {
+              .qdqtbox {
+                margin-left: 5px;
+                cursor: pointer;
+              }
+
+              .qdbtn,
+              .qtbtn {
+                width: 75px;
+                height: 24px;
+                background: rgba(56, 139, 225, 0.16);
+                border-radius: 2px;
+                border: 1px solid #387df7;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                .btntext {
+                  color: #387df7;
+                }
+              }
+
+              .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;
+              }
+            }
+          }
+        }
+
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
+
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
+
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index cdb761cf..735d851f 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -65,32 +65,50 @@
                     <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 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :row-selection="{
-                        columnWidth: 30,
-                        selectedRowKeys: selectedRowKeys,
-                        onChange: onSelectChange,
-                      }"
-                    />
-                    <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize"
-                        :current="currentPage"
-                        :total="tableDataTotal"
-                        class="pagination"
+                  <div class="chooseLeft">
+                    <div class="boeTree">
+                      <a-tree-select
+                        v-model:value="valueSelectboe"
+                        style="width: 240px; border-radius: 4px"
+                        dropdownClassName="changetreedropdownboe"
+                        :dropdown-style="{
+                          maxHeight: '600px',
+                          overflow: 'auto',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                      >
+                        <template #suffixIcon></template>
+                      </a-tree-select>
+                    </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"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
+                        }"
                       />
+                      <div class="pa">
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize"
+                          :current="currentPage"
+                          :total="tableDataTotal"
+                          class="pagination"
+                        />
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -101,36 +119,14 @@
                   style="overflow-y: auto"
                 >
                   <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"
-                          :dropdown-style="{
-                            maxHeight: '400px',
-                            overflow: 'auto',
-                          }"
-                          placeholder="请输入组织名称"
-                          allow-clear
-                          tree-default-expand-all
-                          :tree-data="treeData"
-                        >
-                        </a-tree-select>
-                      </div>
-                    </div>
-                    <div class="t1">
-                      <div class="organize">姓名：</div>
+                    <div class="nameinp">
+                      <div class="namee">组织：</div>
                       <a-input
-                        v-model:value="nameadd"
-                        style="width: 200px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
                       />
                     </div>
-                  </div>
-                  <!-- 选完后出现下面 -->
-                  <div class="searchdown">
                     <div class="btns">
                       <div class="btn1">
                         <div class="img1">
@@ -149,6 +145,34 @@
                         <div class="wz">重置</div>
                       </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="boeTree">
+                    <a-tree-select
+                      v-model:value="valueSelectboe2"
+                      style="width: 240px; border-radius: 4px"
+                      dropdownClassName="changetreedropdownboe"
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                        overflow: 'auto',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData2"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree-select>
+                  </div>
+                  <!-- 选完后出现下面 -->
+                  <!-- <div class="searchdown">
                     <div class="tabb" style="margin-top: 16px">
                       <a-table
                         style="border: 1px solid #f2f6fe"
@@ -177,7 +201,7 @@
                         />
                       </div>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
               </a-tab-pane>
               <a-tab-pane key="3" tab="受众关联">
@@ -284,204 +308,19 @@
               <span class="allclear">全部清除</span>
             </div>
           </div>
-          <div
-            class="selecteds"
-            :style="{ 'max-height': screenHeight - 235 + 'px' }"
-            style="overflow-y: auto"
-          >
-            <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>
-            <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>
-            <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>
-            <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>
-            <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>
-            <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>
-            <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>
-            <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="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>
           </div>
+          <div class="line"></div>
+          <div class="tit">添加组织</div>
+          <div class="line"></div>
+          <div class="tit">受众关联</div>
         </div>
       </div>
       <div class="btnn">
@@ -521,9 +360,12 @@ export default {
       value: [], //级联选择框
       choosevalue: null, //受众选择
       valueSelect: null, //树形选择
+      valueSelectboe: null, //boe树形选择
+      valueSelectboe2: null, //boe树形选择
       name: "",
       nameadd: "",
       nameaddd: "",
+      com: "",
       treeData: [
         {
           title: "京东方",
@@ -691,69 +533,236 @@ export default {
           ],
         },
       ],
+      treeData2: [
+        {
+          title: "京东方",
+          value: "京东方",
+          children: [
+            {
+              title: "产研部",
+              value: "产研部",
+              children: [
+                {
+                  title: "产品部",
+                  value: "产品部",
+                },
+                {
+                  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: "行政部",
+                  value: "行政部",
+                },
+              ],
+            },
+          ],
+        },
+      ],
       tabledata: [
         {
           key: 1,
           name: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 2,
           name: "小刘",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
         {
           key: 3,
           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: "小李",
           bum: "产研部",
           numb: "000000",
-          guishu: "",
+          guishu: "产品部",
         },
       ],
       tablecolumns: [
@@ -761,7 +770,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -769,7 +778,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -777,7 +786,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -785,7 +794,7 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -998,6 +1007,52 @@ 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: "李明",
+        },
+      ],
     });
     const closeDrawer = () => {
       state.activeKey = "1";
@@ -1234,49 +1289,70 @@ 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-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;
+                  }
+                }
+              }
             }
+            .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;
+                }
               }
             }
           }
@@ -1284,45 +1360,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;
@@ -1357,6 +1415,47 @@ 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 {
+            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;
+                }
+              }
+            }
           }
         }
       }
@@ -1416,10 +1515,25 @@ 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;
+        }
         .selecteds {
           display: flex;
           flex-wrap: wrap;
           margin-left: 32px;
+          height: 200px;
+          overflow-y: hidden;
           .chose {
             width: 64px;
             height: 24px;
@@ -1490,4 +1604,18 @@ export default {
     width: 7px !important;
   }
 }
+.changetreedropdownboe {
+  width: 240px !important;
+  border-radius: 5px;
+  min-height: 600px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
 </style>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index eeb9619d..c9510c07 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1326,7 +1326,16 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-              //获取任务列表
+              //后加选择了阶段id
+              // if(state.chooseStageId!==null){
+              //   let final = res.data.data.stageList.find((item)=>item.id==state.chooseStageId)
+              //   getTableData(final)
+              // }else{
+              //   //获取任务列表
+              // let arr = res.data.data.stageList[0].taskList;
+              // console.log("任务列表", arr);
+              // getTableData(arr);
+              // }
               let arr = res.data.data.stageList[0].taskList;
               console.log("任务列表", arr);
               getTableData(arr);
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ebaf0cb1..f83efd1b 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -597,11 +597,11 @@
                     />
                   </div>
                   <div class="groupright">
-                    <div class="btn1">
+                    <div class="btn1" @click="searchGroup">
                       <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
-                    <div class="btn2">
+                    <div class="btn2" @click="resetGroupName">
                       <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
@@ -617,11 +617,16 @@
                     <span class="btn2text">随机分组</span>
                   </div>
                 </div>
+                <!-- 小组列表 -->
                 <div class="groupmain">
-                  <div class="groupbox">
+                  <div
+                    class="groupbox"
+                    v-for="item in groupList"
+                    :key="item.projectGroupId"
+                  >
                     <div style="width: 90%">
                       <div class="grouptitle">
-                        <div class="goodgruop">好好学习小组</div>
+                        <div class="goodgruop">{{ item.groupName }}</div>
                         <div class="more">
                           <span
                             style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
@@ -629,155 +634,19 @@
                           >
                           <div class="moreItems">
                             <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
+                            <div
+                              class="sammo"
+                              @click="deleteGroupBtn(item.projectGroupId)"
+                            >
+                              删除
+                            </div>
                           </div>
                         </div>
                       </div>
-                      <div class="leader">组长：小李</div>
+                      <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
-                      </div>
-                      <div class="grofooter" @click="showMemberList">
-                        <div class="ftext">组员名单 ></div>
-                        <div class="peoples">
-                          <div class="people1">
-                            <img
-                              src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                              src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                              src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                              src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="groupbox">
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">全能小组</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：小李</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
-                      </div>
-                      <div class="grofooter" @click="showMemberList">
-                        <div class="ftext">组员名单 ></div>
-                        <div class="peoples">
-                          <div class="people1">
-                            <img
-                              src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                              src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                              src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                              src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="groupbox">
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">宇宙第一最强小组</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：小李</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
-                      </div>
-                      <div class="grofooter" @click="showMemberList">
-                        <div class="ftext">组员名单 ></div>
-                        <div class="peoples">
-                          <div class="people1">
-                            <img
-                              src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                              src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                              src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                              src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="groupbox">
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">天天向上小组</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo">编辑</div>
-                            <div class="sammo">删除</div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：小李</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="55" />
+                        <a-progress :percent="item.completeRatio" />
                       </div>
                       <div class="grofooter" @click="showMemberList">
                         <div class="ftext">组员名单 ></div>
@@ -954,7 +823,7 @@
              -->
             <div class="line"></div>
             <div class="set_body">
-              <div class="edit" @click="edit_hShow">
+              <div class="edit" @click="showEditProj">
                 <div class="img"></div>
                 <div class="ed">编辑</div>
               </div>
@@ -968,7 +837,7 @@
                 <div class="setc_name"><span>封面图：</span></div>
                 <div class="setc_main">
                   <img
-                    style="width: 151px; height: 84px;"
+                    style="width: 151px; height: 84px"
                     :src="picUrl"
                     alt=""
                   />
@@ -1206,7 +1075,7 @@
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="closeModal2">确定</a-button>
+            <a-button class="pubtn2" @click="createG">确定</a-button>
           </div>
         </div>
       </a-modal>
@@ -1309,232 +1178,7 @@
       </a-modal>
     </div>
     <!-- 删除学员弹窗 -->
-    <!-- 编辑弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="edit_hs"
-        :title="null"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="set_edit"
-        width="679px"
-        @cancel="edit_exit"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span style="width: 15px; height: 15px"
-              ><img src="../../assets/images/taskpage/edit.png"
-            /></span>
-            <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-              >编辑</span
-            >
-          </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="edit_exit">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="projectname">基本信息</div>
-          <div class="setbody">
-            <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_item2">
-              <div class="signbox">
-                <span style="margin-right: 3px">直播封面：</span>
-              </div>
-              <div class="lodalimg">
-                <div class="lodalcenter">
-                  <span style="color: #448ef7; margin-right: 10px">+</span>
-                  <span style="color: #448ef7">添加图片</span>
-                </div>
-              </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">项目时间：</span>
-              </div>
-              <div class="btnbox">
-                <a-range-picker
-                  style="width: 424px"
-                  :placeholder="['      开始时间', '        结束时间']"
-                />
-              </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">项目经理：</span>
-              </div>
-              <div class="btnbox">
-                <a-select
-                  dropdownClassName="dropdown-style"
-                  style="width: 424px"
-                  placeholder="请选择项目经理"
-                  :options="options1"
-                  allowClear
-                  showSearch
-                />
-              </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">资源归属：</span>
-              </div>
-              <div class="btnbox">
-                <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="自动带出 可修改"
-                  maxlength="20"
-                />
-              </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 class="main_item">
-              <div class="signbox">
-                <span style="margin-right: 3px">同步学习记录：</span>
-              </div>
-              <div class="btnbox">
-                <a-radio-group v-model:value="radioV1">
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="1"
-                    @click="cloradio1"
-                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自由免修改课程）
-                  </a-radio>
-                </a-radio-group>
-              </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">项目级别：</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 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 style="margin-right: 3px">是否BOEU实施：</span>
-              </div>
-              <div class="btnbox">
-                <a-radio-group v-model:value="radioV2">
-                  <a-radio
-                    v-model:checked="checked"
-                    :value="1"
-                    @click="cloradio2"
-                    >BOEU实施</a-radio
-                  >
-                </a-radio-group>
-              </div>
-            </div>
-          </div>
 
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal">取消</a-button>
-            <a-button class="pubtn2" @click="closeModal">发布</a-button>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 编辑弹窗 -->
     <!-- 删除弹窗 -->
     <div>
       <a-modal
@@ -1684,6 +1328,8 @@
         </div>
       </a-modal>
     </div>
+    <!-- 编辑项目弹窗 -->
+    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
   </div>
 </template>
 <script>
@@ -1707,11 +1353,18 @@ import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
-import { getProjStu, deleteStu } from "../../api/indexProjStu";
+import {
+  getProjStu,
+  deleteStu,
+  getGroupList,
+  deleteGroup,
+  editGroup,
+} from "../../api/indexProjStu";
 import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
 import { getTask } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
+import projSet from "../../components/Modals/projSet";
 export default {
   name: "taskPage",
   components: {
@@ -1731,6 +1384,7 @@ export default {
     NoticePub,
     ProjectScore,
     TaskImpStu,
+    projSet,
   },
   setup() {
     const state = reactive({
@@ -1763,46 +1417,48 @@ export default {
       ],
       //学员信息列表
       tabledata: [
-        {
-          key: 1,
-          name: "sss",
-          bum: "c",
-          gangw: "ss",
-          group: "sss",
-          progress: "sss",
-          diploma: "0",
-          stutime: "20202",
-          putin: "shs",
-          excellent: true,
-          studentId: 22,
-        },
-        {
-          key: 2,
-          name: "sss",
-          bum: "c",
-          gangw: "ss",
-          group: "sss",
-          progress: "sss",
-          diploma: "0",
-          stutime: "20202",
-          putin: "shs",
-          excellent: true,
-          studentId: 23,
-        },
-        {
-          key: 3,
-          name: "sss",
-          bum: "c",
-          gangw: "ss",
-          group: "sss",
-          progress: "sss",
-          diploma: "0",
-          stutime: "20202",
-          putin: "shs",
-          excellent: false,
-          studentId: 24,
-        },
+        // {
+        //   key: 1,
+        //   name: "sss",
+        //   bum: "c",
+        //   gangw: "ss",
+        //   group: "sss",
+        //   progress: "sss",
+        //   diploma: "0",
+        //   stutime: "20202",
+        //   putin: "shs",
+        //   excellent: true,
+        //   studentId: 22,
+        // },
+        // {
+        //   key: 2,
+        //   name: "sss",
+        //   bum: "c",
+        //   gangw: "ss",
+        //   group: "sss",
+        //   progress: "sss",
+        //   diploma: "0",
+        //   stutime: "20202",
+        //   putin: "shs",
+        //   excellent: true,
+        //   studentId: 23,
+        // },
+        // {
+        //   key: 3,
+        //   name: "sss",
+        //   bum: "c",
+        //   gangw: "ss",
+        //   group: "sss",
+        //   progress: "sss",
+        //   diploma: "0",
+        //   stutime: "20202",
+        //   putin: "shs",
+        //   excellent: false,
+        //   studentId: 24,
+        // },
       ],
+      //小组信息列表
+      groupList: [],
       // stuName: "", //搜索的学员姓名
       // stuGroup: "", //搜索的学员小组名称
       // stuBum: "", //搜索的学员小组部门
@@ -1836,7 +1492,7 @@ export default {
       Importvisible: false, //导入学员
       Seevisible: false, //查看学员
       Changevisible: false, //学员换组
-      edit_hs: false, //编辑弹窗
+      editHs: false, //编辑弹窗
       delete_hs: false, //删除弹窗
       copyModal: false, //面授二维码弹窗
       closeCopy: false, //面授二维码关闭图标
@@ -1873,7 +1529,7 @@ export default {
       noticeChecked: true,
       noticeContent: "",
       TaskFaceImpStuvisible: false, //批量面授报名
-
+      valuestugn: "", //小组管理的输入的小组名称
       //进度排行表
       jindutabledata: [
         {
@@ -2341,7 +1997,6 @@ export default {
       level: null, //项目级别
       systemId: null, //培训体系
       picUrl: null,
-
     });
 
     // 输入接入 -- start --
@@ -2481,6 +2136,16 @@ export default {
     const closeModal2 = () => {
       state.stugroup = false;
     };
+    //点击确定创建小组
+    const createG = () => {
+      if (state.valueaddm == "" || state.valueaddg == "") {
+        message.destroy();
+        return message.warning("请输入必填项");
+      } else {
+        createGroup();
+        state.stugroup = false;
+      }
+    };
     const showCopyModal = () => {
       state.copyModal = true;
     };
@@ -2573,10 +2238,14 @@ export default {
     const closehuodModal = () => {
       state.huodModal = false;
     };
+    const showEditProj = () => {
+      state.editHs = true;
+    };
 
     //学员管理列表操作
     const studentData = () => {
       let arr = state.tabledata;
+      console.log(arr, "学员管理");
       arr.map((value) => {
         value.operation = (
           <div
@@ -2639,16 +2308,15 @@ export default {
         );
       });
       state.tabledata = arr;
-      // console.log("state.tabledata", state.tabledata);
     };
-    studentData();
+    // studentData();
     const studentColumns = () => {
       const tablecolumns = [
         {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -2685,7 +2353,7 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
         },
@@ -2693,7 +2361,7 @@ export default {
           title: "岗位",
           dataIndex: "gangw",
           key: "gangw",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
         },
@@ -2701,7 +2369,7 @@ export default {
           title: "所属小组",
           dataIndex: "group",
           key: "group",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
         },
@@ -2709,7 +2377,7 @@ export default {
           title: "进度",
           dataIndex: "progress",
           key: "progress",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -2717,7 +2385,7 @@ export default {
           title: "证书",
           dataIndex: "diploma",
           key: "diploma",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -2725,7 +2393,7 @@ export default {
           title: "最近学习时间",
           dataIndex: "stutime",
           key: "stutime",
-          width: 50,
+          // width: 50,
           align: "center",
           className: "h",
           // sorter: {
@@ -2737,7 +2405,7 @@ export default {
           title: "加入方式",
           dataIndex: "putin",
           key: "putin",
-          width: 40,
+          // width: 40,
           align: "center",
           className: "h",
         },
@@ -2745,7 +2413,7 @@ export default {
           title: "操作",
           dataIndex: "operation",
           key: "operation",
-          width: 60,
+          // width: 60,
           align: "center",
           className: "h",
         },
@@ -2840,6 +2508,7 @@ export default {
         .then((res) => {
           console.log(res, "单个删除成功");
           message.success("删除成功");
+          getStu();
         })
         .catch((err) => {
           console.log(err, "单个删除失败");
@@ -2869,10 +2538,11 @@ export default {
         .then((res) => {
           console.log(res, "删除成功");
           message.success("删除成功");
+          getStu();
         })
         .catch((err) => {
           console.log(err, "删除失败");
-          message.warning("删除成功");
+          message.warning("删除失败");
         });
       state.allDelete = false;
     };
@@ -2888,21 +2558,19 @@ export default {
       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.userInfoBo.userName, //用户名
+          name: value.name, //用户名
           bum: value.userInfoBo.deptName, //部门
           gangw: value.userInfoBo.jobName, //岗位
-          completeStageCnt: value.userInfoBo.completeStageCnt, //当前完成阶段数
-          totalStageCnt: value.userInfoBo.totalStageCnt, //总阶段数
-          excellent: value.topFlag == 1 ? "0" : "1", //是否优秀学员
-          progress:
-            value.userInfoBo.completeStageCnt +
-            "/" +
-            value.userInfoBo.totalStageCnt,
+          completeStageCnt: value.completeStageCnt, //当前完成阶段数
+          totalStageCnt: value.totalStageCnt, //总阶段数
+          excellent: value.topFlag == 1 ? true : false, //是否优秀学员
+          progress: value.completeStageCnt + "/" + value.totalStageCnt,
           putin:
             value.source == 0
               ? "报名加入"
@@ -2919,14 +2587,34 @@ export default {
       });
       state.tabledata = array;
     };
+    //把小组列表信息放到state里
+    const setGroupList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          projectId: value.projectId, //项目id
+          projectGroupId: value.projectGroupId, //小组id
+          groupName: value.groupName, //小组名称
+          leaderId: value.leaderId, //组长id
+          leaderName: value.leaderName, //组长名称
+          source: value.source == 1 ? "指定添加" : "随机分组",
+          completeTaskCnt: value.completeTaskCnt, //完成任务数
+          totalTaskCnt: value.totalTaskCnt, //累计任务数
+          completeRatio: value.completeRatio, //完成比例
+        };
+        array.push(obj);
+      });
+      state.groupList = array;
+    };
     //学员搜索
     const searchStu = () => {
       let obj = {
         deptIds: [], //部门
         groupName: state.valuestugroup,
         name: state.valuestun,
-        pageNo: 0,
-        pageSize: 0,
+        pageNo: 1,
+        pageSize: 10,
         projectId: state.projectId,
         topFlag:
           state.valuegood == "优秀学员"
@@ -2935,15 +2623,17 @@ export default {
             ? 0
             : null,
       };
-      getProjStu(obj).then((res) => {
-        console.log("搜索成功", res);
-        //重新获取列表
-        let leng = res.data.data.rows;
-        if (leng > 0) {
-          let arr = res.data.data.rows;
-          getTableDataList(arr);
-        }
-      });
+      //重新获取列表
+      getStu(obj);
+      // getProjStu(obj).then((res) => {
+      //   console.log("搜索成功", res);
+      //重新获取列表
+      // let leng = res.data.data.rows;
+      // if (leng > 0) {
+      //   let arr = res.data.data.rows;
+      //   getTableDataList(arr);
+      // }
+      // });
     };
     //勾选学员
     const onSelectChange = (selectedRowKeys, selectedRows) => {
@@ -2966,7 +2656,7 @@ export default {
       // console.log(state.selectedRows[0]);
       // console.log("dddd",selectedRows.)
       //判断是否为数组
-      console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
+      // console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
     };
     //清空所选的学员
     const clearChooseStu = () => {
@@ -2979,32 +2669,32 @@ export default {
         (state.valuestugroup = null),
         (state.valuestub = null),
         (state.valuegood = null);
+        getStu()
     };
     //获取学员列表
-    const getStu = () => {
-      let obj = {
+    const getStu = (obj) => {
+      let objf = obj || {
         deptIds: [], //部门
         groupName: "",
         name: "",
         pageNo: 1,
-        pageSize: 1,
+        pageSize: 10,
         projectId: state.projectId,
         topFlag: 0,
       };
-      getProjStu(obj).then((res) => {
-        console.log(res.data.data.rows, "获取学员列表");
-        let leng = res.data.data.rows;
+      getProjStu(objf).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);
+          studentData();
         }
       });
     };
-    //end---------学员------
-    onMounted(() => {
-      getStu();
-      getTaskList();
+    //获取项目信息
+    const getTaskInfo = () => {
       getTask({
         projectId: state.projectId,
       }).then((res) => {
@@ -3017,7 +2707,6 @@ export default {
         state.startTime = start;
         state.endTime = end;
         state.manager = info.manager;
-        state.sourceBelongId = info.sourceBelongId;
         state.remark = info.remark;
         state.level =
           info.level == 1
@@ -3042,8 +2731,88 @@ export default {
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
         state.checkedBOEU = info.boeFlag == 1 ? true : false;
         state.picUrl = info.picUrl;
-        state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-"
+        state.sourceBelong =
+          info.sourceBelongId == 1
+            ? "项目一"
+            : info.sourceBelongId == 2
+            ? "项目二"
+            : info.sourceBelongId == 3
+            ? "项目三"
+            : "-";
       });
+    };
+    //获取小组列表
+    const getGroup = (obj) => {
+      let objf = obj || {
+        name: "",
+        pageNo: 1,
+        pageSize: 10,
+        projectId: state.projectId,
+      };
+      getGroupList(objf)
+        .then((res) => {
+          console.log(res.data.data.rows, "获取小组列表成功");
+          let leng = res.data.data.rows.length;
+          if (leng > 0) {
+            let arr = res.data.data.rows;
+            setGroupList(arr);
+          }
+        })
+        .catch((err) => {
+          console.log(err, "获取列表失败");
+        });
+    };
+    //删除小组
+    const deleteGroupBtn = (projectGroupId) => {
+      deleteGroup({
+        projectGroupId: projectGroupId,
+      }).then((res) => {
+        console.log("删除小组成功", res);
+        message.success("删除小组成功");
+        getGroup();
+      });
+    };
+    //创建小组
+    const createGroup = () => {
+      let obj = {
+        groupName: state.valueaddg,
+        leaderId: 0,
+        leaderName: state.valueaddm,
+        projectGroupId: 0,
+        projectId: state.projectId,
+      };
+      editGroup(obj)
+        .then((res) => {
+          console.log("小组创建成功", res);
+          message.success("小组创建成功");
+          getGroup();
+        })
+        .catch((err) => {
+          console.log("小组创建失败", err);
+          message.warning("小组创建失败");
+        });
+    };
+    //搜索小组重置
+    const resetGroupName = () => {
+      state.valuestugn = null;
+      getGroup();
+    };
+    //小组搜索
+    const searchGroup = () => {
+      let obj = {
+        name: state.valuestugn,
+        pageNo: 1,
+        pageSize: 10,
+        projectId: state.projectId,
+      };
+      getGroup(obj);
+    };
+    //end---------学员------
+    onMounted(() => {
+      getStu();
+      getTaskList();
+      getTaskInfo();
+      getGroup();
     });
     return {
       ...toRefs(state),
@@ -3105,6 +2874,16 @@ export default {
       closeCancelDelete,
       clearChooseStu,
       closeDeleteOneConfirm,
+      showEditProj,
+      getTaskInfo,
+      getGroup,
+      getGroupList,
+      setGroupList,
+      deleteGroupBtn,
+      createGroup,
+      createG,
+      resetGroupName,
+      searchGroup,
     };
   },
 };
@@ -5268,206 +5047,6 @@ export default {
   }
 }
 
-.set_edit {
-  .ant-modal {
-    width: 866px !important;
-    height: 870px !important;
-
-    .ant-modal-body {
-      .modalHeader {
-        background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
-        );
-      }
-
-      padding: 0;
-
-      .modalHeader {
-        background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
-        );
-      }
-
-      .modalMain {
-        .projectname {
-          color: rgba(79, 81, 86, 1);
-          font-size: 14px;
-          line-height: 36px;
-          margin-left: 62px;
-          font-weight: 500;
-          margin-bottom: 24px;
-        }
-
-        .setbody {
-          margin-left: 67px;
-
-          .main_item {
-            display: flex;
-            align-items: center;
-            margin-bottom: 32px;
-
-            .signbox {
-              width: 130px;
-              display: flex;
-              justify-content: end;
-              align-items: center;
-              white-space: nowrap;
-
-              .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;
-              }
-            }
-          }
-
-          .main_item2 {
-            display: flex;
-            align-items: flex-start;
-            margin-bottom: 32px;
-
-            .signbox {
-              width: 130px;
-              display: flex;
-              justify-content: end;
-              align-items: center;
-              white-space: nowrap;
-
-              .sign {
-                margin-right: 5px;
-              }
-            }
-
-            .lodalimg {
-              width: 120px;
-              height: 120px;
-              border: 1px dashed #387df7;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              cursor: pointer;
-
-              .lodalimg {
-                display: flex;
-                white-space: nowrap;
-              }
-            }
-
-            .kqszbox {
-              .qdqtbox {
-                margin-left: 5px;
-                cursor: pointer;
-              }
-
-              .qdbtn,
-              .qtbtn {
-                width: 75px;
-                height: 24px;
-                background: rgba(56, 139, 225, 0.16);
-                border-radius: 2px;
-                border: 1px solid #387df7;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-
-                .btntext {
-                  color: #387df7;
-                }
-              }
-
-              .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;
-              }
-            }
-          }
-        }
-
-        .pubtn {
-          display: flex;
-          justify-content: center;
-          margin-top: 25px;
-
-          //margin-bottom: 29px;
-          .pubtn1 {
-            width: 100px;
-            height: 40px;
-            margin-right: 16px;
-            margin-bottom: 29px;
-            border: 1px solid #409eff;
-            border-radius: 4px;
-            color: rgba(78, 166, 255, 1);
-            font-size: 14px;
-            //line-height: 36px;
-            align-items: center;
-            background: rgba(255, 255, 255, 1);
-          }
-
-          .pubtn2 {
-            width: 100px;
-            height: 40px;
-            margin-bottom: 29px;
-            border: 1px solid #409eff;
-            border-radius: 4px;
-            color: #ffffff;
-            font-size: 14px;
-            align-items: center;
-            //line-height: 36px;
-            background: #409eff;
-          }
-        }
-      }
-    }
-  }
-}
-
 .DelModal {
   .ant-modal {
     .ant-modal-content {

From b6741f9eca9d68e7b7f6f9898b61aec4e1f8fdc6 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 10 Nov 2022 16:29:16 +0800
Subject: [PATCH 17/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1=E5=8F=8A=E5=85=B3=E5=8D=A1=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                         |   3 +-
 src/api/indexLevel.js                     |  11 +-
 src/assets/images/leveladd/delete.png     | Bin 0 -> 302 bytes
 src/views/learningpath/LearningPath.vue   | 154 +++++++++-------
 src/views/learningpath/LevelAddDetail.vue |  80 +++++++--
 src/views/projectcenter/ProjectManage.vue | 209 ++++++++++++----------
 6 files changed, 276 insertions(+), 181 deletions(-)
 create mode 100644 src/assets/images/leveladd/delete.png

diff --git a/src/api/index1.js b/src/api/index1.js
index 0024073f..e21c301b 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-09 09:32:52
+ * @LastEditTime: 2022-11-10 11:41:52
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -59,6 +59,7 @@ export const getChapter = (obj) => http.post('/admin/router/detail', { params: o
 
 //新建或编辑关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
+
 //获取学员列表
 export const getStudent = (obj) => http.post('/admin/router/studentList', obj);
 //获取路径图详情-包含关卡及任务列表
diff --git a/src/api/indexLevel.js b/src/api/indexLevel.js
index 4cfe5d58..303fe7ea 100644
--- a/src/api/indexLevel.js
+++ b/src/api/indexLevel.js
@@ -1,10 +1,19 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-10 11:50:08
+ * @FilePath: /fe-manage/src/api/indexLevel.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import http from "./config";
 
 //新建关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
 //编辑关卡
 export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj);
-
+//删除关卡
+export const deleteChapter=(obj)=>http.delete('/admin/router/deleteChapter',{params:obj})
 //删除任务
 export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj});
 
diff --git a/src/assets/images/leveladd/delete.png b/src/assets/images/leveladd/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdfeacc1aff7e9918b33363ad1b5c6f20ea17759
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#=t)FDR5(xVlD`fCK@i5ji6`&`3WZ)YqS0EpyJrxMO2i9@7Z6ct#53GpZZ!&x
zT;mZa^b$`XBexg#XD!z%Y&SDsemnEc5G;?Cy8%!)N*5AxXv)b<u=4f*Hvm2tYZL=-
zBxEz6w*cHbz;hD8GB0H1OaPjZkktZ!LuUb^fo+u19P?Ipz&meTDz*ry=da#I(7?DW
z0Mrkrw%F<ct88{w?m+{D>}o(RHoZtY_ye?2=>h$MiJp_J(GQX}X7RT*MgUp>jwM&w
z0dOKA+xnB2m_tzmDkBi-!pFxP0gpBH)iu^U0nrx6p!K&V5&!@I07*qoM6N<$g3elW
A%K!iX

literal 0
HcmV?d00001

diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 8b02c597..6ca6b5d4 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -147,6 +147,7 @@
                 v-model:value="pathName"
                 maxlength="20"
                 style="border-radius: 4px"
+                placeholder="请输入学习路径名称"
               />
               <div class="showcount">{{ pathName.length }}/20</div>
             </div>
@@ -187,7 +188,7 @@
               />
             </div>
             <div class="inname">路径图背景</div>
-            <div class="in">
+            <div class="in learnBg">
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
@@ -195,18 +196,12 @@
                 @click="chooseImg(item)"
                 v-for="item in imgData"
                 :key="item.key"
-                style="
-                  border-radius: 8px;
-                  width: 136px;
-                  height: 106px;
-                  background-size: 100%;
-                  background-repeat: no-repeat;
-                "
+               class="learnBgItem"
                 :style="{
                   border:
                     learnPathBg === item.id
                       ? '2px solid rgba(78, 166, 255, 1)'
-                      : '2px solid rgba(78, 166, 255, 0)',
+                      : '1px solid #ccc',
                   'background-image': 'url(' + item.source + ')',
                 }"
               >
@@ -268,6 +263,7 @@
                 v-model:value="pathName"
                 maxlength="20"
                 style="border-radius: 4px"
+                 placeholder="请输入学习路径名称"
               />
               <div class="showcount">{{ pathName.length }}/20</div>
             </div>
@@ -308,26 +304,20 @@
               />
             </div>
             <div class="inname">路径图背景</div>
-            <div class="in">
+            <div class="in learnBg">
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
               <div
-                @click="chooseImg(item)"
+                @click="chooseImg2(item)"
                 v-for="item in imgData"
                 :key="item.key"
-                style="
-                  border-radius: 8px;
-                  width: 136px;
-                  height: 106px;
-                  background-size: 100%;
-                  background-repeat: no-repeat;
-                "
+                class="learnBgItem"
                 :style="{
                   border:
                     learnPathBg2 === item.id
                       ? '2px solid rgba(78, 166, 255, 1)'
-                      : '2px solid rgba(78, 166, 255, 0)',
+                      : '1px solid #ccc',
                   'background-image': 'url(' + item.source + ')',
                 }"
               >
@@ -440,17 +430,17 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="delete_exit">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="delete_exit">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
       </div>
     </a-modal>
-    <!-- 停用路径弹窗 -->
+    <!-- 结束路径弹窗 -->
     <a-modal
       v-model:visible="stopModal"
       :footer="null"
@@ -467,20 +457,24 @@
             <div class="close_exit" @click="closeStopModal"></div>
           </div>
           <div class="body">
-            <span>您确定要停用此路径吗</span>
+            <!-- <span>您确定要停用此路径吗</span> -->
+            <span>是否结束项目</span>
+            <div class="back">
+              （项目结束后学员将无法继续学习，此操作不可逆）
+            </div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeStopModal">取消</div>
+            <div class="del_btn btn1" @click="closeStopModal">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="stopLearnPath">确定</div>
+            <div class="del_btn btn2" @click="stopLearnPath">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
       </div>
     </a-modal>
-    <!-- 删除路径弹窗 -->
+    <!-- 结束路径弹窗 -->
     <a-modal
       v-model:visible="deleteModal"
       :footer="null"
@@ -500,11 +494,11 @@
             <span>您确定要删除此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeDeleteModal">取消</div>
+            <div class="del_btn btn1" @click="closeDeleteModal">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="deleteLearnPath">确定</div>
+            <div class="del_btn btn2" @click="deleteLearnPath">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -530,11 +524,11 @@
             <span>您确定要启用此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="delete_exit">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="delete_exit">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -561,11 +555,11 @@
             <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeBackModal">取消</div>
+            <div class="del_btn btn1" @click="closeBackModal">
+              <div class="btnText" >取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="recallPath">确定</div>
+            <div class="del_btn btn2" @click="recallPath">
+              <div class="btnText" >确定</div>
             </div>
           </div>
         </div>
@@ -634,6 +628,14 @@ export default {
           id: 3,
           source: require("../../assets/images/leveladd/3.png"),
         },
+        {
+          id: 4,
+          source: require("../../assets/images/leveladd/2.png"),
+        },
+        {
+          id: 5,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
       ],
       learnPathBg: null, //创建路径选择的路径图背景
       learnPathBg2: null, //编辑路径选择的路径图背景
@@ -752,12 +754,12 @@ export default {
       state.editPathId = null;
     };
     const chooseImg = (item) => {
-      console.log(item);
+      // console.log(item);
       state.learnPathBg = item.id;
     };
-    const chooseImg2 = (id) => {
-      console.log(id);
-      state.learnPathBg2 = id;
+    const chooseImg2 = (item) => {
+      // console.log(item);
+      state.learnPathBg2 = item.id;
     };
     //发布弹窗
     const showPub = (routerId) => {
@@ -820,15 +822,15 @@ export default {
     const closeCopyModal = () => {
       state.copyModal = false;
     };
-    //显示停用窗口
+    //显示结束窗口
     const showStopModal = () => {
       state.stopModal = true;
     };
-    //关闭停用窗口
+    //关闭结束窗口
     const closeStopModal = () => {
       state.stopModal = false;
     };
-    //确认停用
+    //确认结束
     const stopLearnPath = () => {
       let obj = {
         routerId: state.stopPathId,
@@ -916,7 +918,7 @@ export default {
               : value.status === 1
               ? "已发布"
               : value.status === -1
-              ? "已停用"
+              ? "已结束"
               : "-",
           creater: value.createName ? value.createName : "-",
           pubtime: value.publishTime
@@ -1141,20 +1143,7 @@ export default {
                           复制
                         </div>
                       </a-select-option>
-                      <a-select-option
-                        value="停用"
-                        label="停用"
-                        style="padding-left:35px"
-                      >
-                        <div
-                          onClick={() => {
-                            state.stopPathId = text.record.id;
-                            showStopModal();
-                          }}
-                        >
-                          停用
-                        </div>
-                      </a-select-option>
+                     
                       <a-select-option
                         value="删除"
                         label="删除"
@@ -1208,12 +1197,26 @@ export default {
                             撤回
                           </div>
                         </a-select-option>
+                         <a-select-option
+                        value="结束"
+                        label="结束"
+                        style="padding-left:35px"
+                      >
+                        <div
+                          onClick={() => {
+                            state.stopPathId = text.record.id;
+                            showStopModal();
+                          }}
+                        >
+                          结束
+                        </div>
+                      </a-select-option>
                       </a-select>
                     </div>
                   ) : (
                     <div></div>
                   )}
-                  {text.record.state === "已停用" ? (
+                  {text.record.state === "已结束" ? (
                     <div>
                       <a-select
                         style="width: 50px;margin-top:2px;margin-right:20px;"
@@ -1233,6 +1236,7 @@ export default {
                             复制
                           </div>
                         </a-select-option>
+                        {/**
                         <a-select-option
                           value="启用"
                           label="启用"
@@ -1246,6 +1250,7 @@ export default {
                             启用
                           </div>
                         </a-select-option>
+                        */}
 
                         <a-select-option
                           value="删除"
@@ -1629,10 +1634,10 @@ export default {
               .in {
                 margin-left: 14px;
                 width: 81%;
-                height: 110px;
+                // height: 110px;
                 // background-color: red;
                 display: flex;
-                justify-content: space-between;
+                // justify-content: space-between;
                 .im {
                   border-radius: 8px;
                   width: 140px;
@@ -1640,6 +1645,21 @@ export default {
                   cursor: pointer;
                 }
               }
+              .learnBg{
+                display: flex;
+                flex-wrap: wrap;
+                min-height: 110px;
+              .learnBgItem{
+                 border-radius: 8px;
+                  width: 136px;
+                  height: 106px;
+                  background-size: 100%;
+                  background-repeat: no-repeat;
+                   margin-bottom: 20px;
+                     margin-right: 6px;
+              }
+               
+              }
             }
             .info {
               width: 78%;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index fcb825b0..0fb531f9 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -32,17 +32,48 @@
               >
                 <div class="items1">
                   <div class="boxs_left">
-                    <div class="script">
-                      <span style="font-size: 12px; color: #ffffff">说明</span>
-                    </div>
+                    <a-popover placement="topLeft" trigger="click">
+                      <template #content>
+                        <div style="width: 130px">
+                          {{ element.remark ? element.remark : "暂无说明" }}
+                        </div>
+                      </template>
+                      <template #title>
+                        <span>关卡说明</span>
+                      </template>
+                      <div class="script">
+                        <span style="font-size: 12px; color: #ffffff"
+                          >说明</span
+                        >
+                      </div>
+                    </a-popover>
+
                     <div class="imgIcon"></div>
                   </div>
                   <div class="boxs_right">
-                    <div class="imgIcon"></div>
+                    <div class="imgIcon" @click="deleteChapter(element.chapterId)"></div>
                   </div>
                 </div>
                 <div class="items2">
-                  <div class="nname">{{ element.name }}</div>
+                  <a-popover
+                    placement="topLeft"
+                    v-if="element.name.length > 10"
+                  >
+                    <template #content>
+                      <div style="width: 130px">
+                        {{ element.name }}
+                      </div>
+                    </template>
+                    <!-- <template #title>
+                        <span>关卡说明</span>
+                      </template> -->
+                    <div class="nname">
+                      {{ element.name }}
+                    </div>
+                  </a-popover>
+                  <div class="nname" v-if="element.name.length <= 10">
+                    {{ element.name }}
+                  </div>
                 </div>
                 <!-- <div class="itemle">
               <div class="tit">{{ item.remark }}</div>
@@ -1215,6 +1246,7 @@ export default {
     const getDetail = () => {
       GetRouterDetail(state.routerId)
         .then((res) => {
+          console.log("res.data.data.chapterList", res.data.data.chapterList);
           state.level = res.data.data.chapterList;
           if (state.level.length > 0) {
             dataAssignment(state.level[0].chapterId);
@@ -1743,6 +1775,17 @@ export default {
         showDrawerAddTest(id, eleId);
       }
     };
+    //删除关卡
+    const deleteChapter=(chapterId)=>{
+let obj={
+  chapterId:chapterId
+}
+api.deleteChapter(obj).then(res=>{
+console.log('删除关卡成功',res)
+}).catch(err=>{
+  console.log('删除关卡失败',err)
+})
+    }
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1785,6 +1828,7 @@ export default {
       showEditLiveDrawer,
       decideType,
       updateTableData,
+      deleteChapter,
     };
   },
 };
@@ -2180,9 +2224,7 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: center;
-        .chosen {
-          // background-color: pink;
-        }
+
         .ghost {
           // background-color: red;
           opacity: 0 !important;
@@ -2219,28 +2261,34 @@ export default {
                 white-space: nowrap;
               }
               .imgIcon {
-                width: 14px;
-                height: 14px;
+                width: 16px;
+                height: 16px;
                 background-image: url(@/assets/images/leveladd/edit.png);
                 background-size: 100% 100%;
               }
             }
             .boxs_right {
               .imgIcon {
-                width: 14px;
-                height: 14px;
-                background-image: url(@/assets/images/leveladd/z1.png);
+                width: 16px;
+                height: 16px;
+                background-image: url(@/assets/images/leveladd/delete.png);
                 background-size: 100% 100%;
               }
             }
           }
           .items2 {
             .nname {
-              width: 100px;
+              width: 140px;
+              // overflow: hidden;
+              // text-overflow: ellipsis;
+              // white-space: nowrap;
+              font-weight: bold;
+
               overflow: hidden;
               text-overflow: ellipsis;
-              white-space: nowrap;
-              font-weight: bold;
+              -webkit-line-clamp: 2;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
             }
           }
         }
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index a121bc62..00a53bf2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -60,11 +60,11 @@
         <div style="display: flex; margin-bottom: 20px">
           <div class="btnn btn1" @click="searchSubmit">
             <div class="search"></div>
-            <div class="btnText" >搜索</div>
+            <div class="btnText">搜索</div>
           </div>
           <div class="btn btn2" @click="searchReset">
             <div class="search"></div>
-            <div class="btnText" >重置</div>
+            <div class="btnText">重置</div>
           </div>
         </div>
       </div>
@@ -816,11 +816,11 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="delete_exit">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+            <div class="del_btn btn2" @click="delete_exit">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -850,10 +850,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeStopModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="finishProject">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -880,10 +880,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteProject">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -909,11 +909,11 @@
             <span>您确定要存为模版吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="closeStartModal">取消</div>
+            <div class="del_btn btn1" @click="closeStartModal">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="templateProject">确定</div>
+            <div class="del_btn btn2" @click="templateProject">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -960,11 +960,11 @@
         </div>
       </div>
       <div class="modalMain">
-        <div class="projectname">产品经理上升路径</div>
-        <!-- <div class="projecttime">
-          <span class="timeti">路径时间：</span
-          ><span class="timeme">2022/08/01-2022/08/30</span>
-        </div> -->
+        <div class="projectname">{{ releaseProjectName }}</div>
+        <div class="projecttime" v-if="releaseProjectTime">
+          <span class="timeti">项目时间：</span
+          ><span class="timeme">{{ releaseProjectTime }}</span>
+        </div>
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">项目信息</div>
@@ -1015,10 +1015,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeBackModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallProject">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -1081,16 +1081,18 @@ export default {
       currentEditChildrensProjectId: "",
       dcProjectID: "",
 
-  currentPage: 1, //当前页
+      currentPage: 1, //当前页
       tableDataTotal: -1, //学习路径列表总数
       pageSize: 10, //每页10条数据
 
-			projectStudentsNum:0,//发布弹窗-学员人数
+      projectStudentsNum: 0, //发布弹窗-学员人数
       releaseProjectId: null, //发布的项目id
-      recallProjectId:null,//撤回的项目id
-      finishProjectId:null,//结束的项目id
-       deleteProjectId:null,//删除的项目id
-       templateProjectId:null,//存为模版的项目id
+      releaseProjectName: null, //发布的项目名称
+      releaseProjectTime: null, //发布的项目时间
+      recallProjectId: null, //撤回的项目id
+      finishProjectId: null, //结束的项目id
+      deleteProjectId: null, //删除的项目id
+      templateProjectId: null, //存为模版的项目id
     });
     // 数据接入 - start -
     const router = useRouter();
@@ -1155,13 +1157,14 @@ export default {
       endTime = "";
       status = null;
       managerid = "";
-      state.currentPage=1
+      state.currentPage = 1;
       getTableDate();
     };
 
+
     const searchSubmit = () => {
-      console.log('点击了搜索')
-      state.currentPage=1
+      console.log("点击了搜索");
+      state.currentPage = 1;
       const obj = {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
@@ -1366,7 +1369,7 @@ export default {
             state.doublepro = false;
             message.destroy();
             message.success("创建成功");
-            state.currentPage=1
+            state.currentPage = 1;
             getTableDate();
           }
         })
@@ -1611,7 +1614,7 @@ export default {
             state.doublesonpro = false;
             message.destroy();
             message.success("创建成功");
-             state.currentPage=1
+            state.currentPage = 1;
             getTableDate();
           }
         })
@@ -1622,9 +1625,6 @@ export default {
         });
     };
 
-
-
-
     // 编辑多层子项目
     const edvalue6 = ref("");
     const edvalue7 = ref([]);
@@ -1760,31 +1760,37 @@ export default {
       state.eddoublesonpro = false;
     };
 
- 
     //打开发布弹窗
-    const showProjectPub = (projectId) => {
+    const showProjectPub = (object) => {
       state.projectPub = true;
-      state.releaseProjectId = projectId;
-			console.log('projectId',projectId)
-			 //获取学员总数
+      state.releaseProjectId = object.projectId;
+      state.releaseProjectName = object.name;
+      state.releaseProjectTime = object.time;
+      console.log("object", object);
+      //获取学员总数
       let obj = {
         pageNo: 0,
         pageSize: 0,
-        projectId: projectId,
+        projectId: object.projectId,
       };
-			api.projectStudent(obj).then(res=>{
- if (res.status === 200) {
-            console.log("res", res.data);
-            state.projectStudentsNum = res.data.data.total;
+      api
+        .projectStudent(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("res", res.data);
+            state.projectStudentsNum = res.data.data.total
+              ? res.data.data.total
+              : 0;
           }
-			}).catch(err=>{
-console.log('获取学员人数失败',err)
-			})
-			//获取阶段及任务总数
+        })
+        .catch((err) => {
+          console.log("获取学员人数失败", err);
+        });
+      //获取阶段及任务总数
     };
-       //确认发布项目
+    //确认发布项目
     const releaseProject = () => {
-			console.log('点击发布')
+      console.log("点击发布");
       let obj = {
         projectId: state.releaseProjectId,
       };
@@ -1792,26 +1798,26 @@ console.log('获取学员人数失败',err)
         .releaseProject(obj)
         .then((res) => {
           console.log("发布成功", res);
-					 message.destroy();
+          message.destroy();
           message.success("发布成功");
-					state.projectPub = false
-					getTableDate()
+          state.projectPub = false;
+          getTableDate();
         })
         .catch((err) => {
           console.log("发布失败", err);
         });
     };
     //关闭发布弹窗
-     const closeProjectPub = () => {
+    const closeProjectPub = () => {
       state.projectPub = false;
     };
-        //打开撤回弹窗
- const showBackModal = (projectId) => {
+    //打开撤回弹窗
+    const showBackModal = (projectId) => {
       state.backModal = true;
-state.recallProjectId = projectId;
+      state.recallProjectId = projectId;
     };
     //确认撤回发布
-     const recallProject = () => {
+    const recallProject = () => {
       let obj = {
         projectId: state.recallProjectId,
         type: 0,
@@ -1829,18 +1835,18 @@ state.recallProjectId = projectId;
           console.log("撤回失败", err);
         });
     };
-        //关闭撤回弹窗
+    //关闭撤回弹窗
     const closeBackModal = () => {
       state.backModal = false;
     };
-//打开结束弹窗
-const showStopModal = (projectId) => {
+    //打开结束弹窗
+    const showStopModal = (projectId) => {
       state.stopModal = true;
-      state.finishProjectId=projectId
+      state.finishProjectId = projectId;
     };
-//确认结束
-const finishProject=()=>{
-let obj = {
+    //确认结束
+    const finishProject = () => {
+      let obj = {
         projectId: state.finishProjectId,
         type: -1,
       };
@@ -1856,19 +1862,19 @@ let obj = {
         .catch((err) => {
           console.log("结束失败", err);
         });
-}
+    };
     //关闭结束弹窗
     const closeStopModal = () => {
       state.stopModal = false;
     };
     //打开删除弹窗
-const showDeleteModal = (projectId) => {
+    const showDeleteModal = (projectId) => {
       state.deleteModal = true;
-      state.deleteProjectId=projectId
+      state.deleteProjectId = projectId;
     };
     //确认删除
-const deleteProject=()=>{
-let obj = {
+    const deleteProject = () => {
+      let obj = {
         projectId: state.deleteProjectId,
         type: -2,
       };
@@ -1884,19 +1890,19 @@ let obj = {
         .catch((err) => {
           console.log("删除失败", err);
         });
-}
+    };
     //关闭删除弹窗
     const closeDeleteModal = () => {
       state.deleteModal = false;
     };
-//打开存为模版弹窗
- const showStartModal = (projectId) => {
+    //打开存为模版弹窗
+    const showStartModal = (projectId) => {
       state.startModal = true;
-      state.templateProjectId=projectId
+      state.templateProjectId = projectId;
     };
     //确认存为模版
-const templateProject=()=>{
-let obj = {
+    const templateProject = () => {
+      let obj = {
         projectId: state.templateProjectId,
         type: 1,
       };
@@ -1912,12 +1918,11 @@ let obj = {
         .catch((err) => {
           console.log("模版保存失败", err);
         });
-}
+    };
     //关闭存为模版弹窗
     const closeStartModal = () => {
       state.startModal = false;
     };
-   
 
     // 数据接入 - end -
 
@@ -1934,7 +1939,6 @@ let obj = {
 
     // 获取项目列表信息
     let tableData = ref([]);
-    
 
     const columns = ref([
       {
@@ -1971,17 +1975,17 @@ let obj = {
                 ? "草稿"
                 : value.record.status == 1 &&
                   Number(value.record.beginTime) <
-                    Math.ceil(new Date().getTime / 1000)
+                    Math.ceil(new Date().getTime() / 1000)
                 ? "进行中"
                 : value.record.status == 1 &&
                   Number(value.record.beginTime) >
-                    Math.ceil(new Date().getTime / 1000) &&
+                    Math.ceil(new Date().getTime() / 1000) &&
                   value.record.type !== 1 &&
                   value.record.type !== 2
                 ? "未开始"
-                : value.record.status == 2
-                ? "未开始"
-                : "已结束"}
+                : value.record.status == -1
+                ? "已结束"
+                : "-"}
             </div>
           );
         },
@@ -2689,7 +2693,21 @@ let obj = {
               {value.record.status === 0 ? (
                 <span
                   onClick={() => {
-                    showProjectPub(value.record.projectId);
+                    console.log("value.record", value.record);
+                    let beginTime = value.record.beginTime
+                      ? toDate(value.record.beginTime, "Y/M/D")
+                      : "";
+                    let endTime = value.record.beginTime
+                      ? toDate(value.record.endTime, "Y/M/D")
+                      : "";
+                    let time =
+                      beginTime && endTime ? beginTime + "-" + endTime : "";
+                    let obj = {
+                      projectId: value.record.projectId,
+                      name: value.record.name,
+                      time: time,
+                    };
+                    showProjectPub(obj);
                   }}
                   style="cursor:pointer"
                   class="operation3"
@@ -2750,7 +2768,7 @@ let obj = {
                 ) : value.record.status === 1 ||
                   (value.record.status == 1 &&
                     Number(value.record.beginTime) >
-                      Math.ceil(new Date().getTime / 1000)) ? (
+                      Math.ceil(new Date().getTime() / 1000)) ? (
                   <a-select
                     style="width: 50px"
                     value="更多"
@@ -2879,7 +2897,7 @@ let obj = {
             state.tableDataTotal = Number(res.data.data.total);
             let data = res.data.data.rows;
             // let data = state.tableData;
-             if (
+            if (
               data.length === 0 &&
               res.data.data.total > 0 &&
               state.currentPage > 1
@@ -2889,7 +2907,7 @@ let obj = {
             }
             console.log("1266", data);
             data.map((value) => {
-              console.log("value %o", value);
+              // console.log("value %o", value);
               if (value.type == 1) {
                 value.children = value.subList;
                 value.key = value.projectId;
@@ -2904,14 +2922,14 @@ let obj = {
                       data2.paraentName = value.name + "/" + data.name;
                       data2.isbj = "class";
                     });
-                    console.log("lalallalaa", data);
+                    // console.log("lalallalaa", data);
                   } else {
                     data.paraentName = value.name;
                   }
                 });
               }
 
-              console.log("map-value", value.subList, value.children);
+              // console.log("map-value", value.subList, value.children);
             });
             tableData.value = data;
             console.log("tableData", tableData);
@@ -2964,9 +2982,7 @@ let obj = {
     const closeCopyModal = () => {
       state.copyModal = false;
     };
-    
-    
-   
+
     const showProjOwner = () => {
       state.ProjOwnervisible = true;
     };
@@ -2979,7 +2995,7 @@ let obj = {
     const showProjManage = () => {
       state.ProjManagevisible = true;
     };
-   
+
     return {
       ...toRefs(state),
       selectProjectName,
@@ -3841,8 +3857,9 @@ let obj = {
           color: rgba(79, 81, 86, 1);
           font-size: 14px;
           line-height: 36px;
-          margin-left: 62px;
+          // margin-left: 62px;
           font-weight: 500;
+          text-align: center;
         }
         .projecttime {
           margin-left: 221px;

From be018b093ce5b2d64985c15ebef2552342de0600 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Thu, 10 Nov 2022 18:02:08 +0800
Subject: [PATCH 18/90] =?UTF-8?q?feat:=E6=9F=A5=E7=9C=8B=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js              |   5 +-
 src/components/drawers/SeeStu.vue    | 161 ++++++++++++++++++++-------
 src/views/projectcenter/TaskPage.vue |   7 +-
 3 files changed, 128 insertions(+), 45 deletions(-)

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index b28fa230..8d9ddff3 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -13,4 +13,7 @@ export const getGroupList = (obj) => http.post('/admin/project/groupList', obj)
 export const deleteGroup = (obj) => http.delete('/admin/project/deleteGroup', { params: obj })
 
 //新增或编辑小组
-export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
\ No newline at end of file
+export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
+
+//查看学员
+export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
\ No newline at end of file
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index ab8a693e..e55199b7 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -21,8 +21,8 @@
             <img src="../../assets/images/studentimg/character.png" />
           </div>
           <div class="stumation">
-            <div class="stuname">王明</div>
-            <div class="stugangw">产研部门 - 产品经理</div>
+            <div class="stuname">{{ userName }}</div>
+            <div class="stugangw">{{ deptName }} - {{ jobName }}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
@@ -42,8 +42,8 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
-              <span class="nub1">3</span>
-              <span class="total">/10</span>
+              <span class="nub1">{{ currentReqCnt }}</span>
+              <span class="total">/{{ totalReqCnt }}</span>
             </div>
           </div>
           <a-divider
@@ -57,12 +57,12 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">1</span>
+              <span class="nub1">{{ certCnt }}</span>
             </div>
           </div>
         </div>
         <div class="secondrow">
-          <div class="rowleft">产品经理管理 - 腾飞班1</div>
+          <div class="rowleft">{{ name }}</div>
           <div class="rowbox" @click="showProMess">
             <div class="shuom">说明</div>
             <div><img src="../../assets/images/studentimg/chak.png" /></div>
@@ -82,13 +82,13 @@
               <div></div>
             </template>
             <a-collapse-panel
-              v-for="(value, index) in stageList"
-              :key="index"
-              :header="value.text"
+              v-for="value in stageList"
+              :key="value.stageId"
+              :header="value.stageName"
             >
               <div
                 class="rowclass"
-                v-for="(item, key) in value.children"
+                v-for="(item, key) in value.taskProcessList"
                 :key="key"
               >
                 <div class="leftclass">
@@ -119,6 +119,8 @@
                           ? require('../../assets/images/leveladd/diao.png')
                           : item.course === '投票'
                           ? require('../../assets/images/leveladd/tou.png')
+                          : item.course === '评估'
+                          ? require('../../assets/images/leveladd/diao.png')
                           : null
                       "
                     />
@@ -154,6 +156,7 @@
 <script>
 import { reactive, toRefs } from "vue";
 import ProMess from "./ProMess.vue";
+import { studentProcess } from "../../api/indexProjStu";
 export default {
   name: "SeeStu",
   components: { ProMess },
@@ -162,16 +165,32 @@ export default {
       type: Boolean,
       default: false,
     },
+    checkStuId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
+      userName: null, //用户名
+      deptName: null, //部门
+      jobName: null, //岗位
+      certCnt: null, //已修证书
+      name: null, //路径图名称
+      totalReqCnt: null, //累计必修数
+      currentReqCnt: null, //完成必修数
       Provisible: false,
       showDown: true,
       showDown1: false,
       stageList: [
         {
-          text: "阶段1腾飞班阶段1",
-          children: [
+          stageName: "阶段1腾飞班阶段1",
+          stageId: 1,
+          taskProcessList: [
             {
               course: "在线",
               name: "如何成为一个产品经理",
@@ -199,36 +218,6 @@ export default {
             },
           ],
         },
-        {
-          text: "阶段2腾飞班阶段2",
-          children: [
-            {
-              course: "考试",
-              name: "如何成为一个产品经理",
-              complete: "已完成",
-            },
-            {
-              course: "案例",
-              name: "如何成为一个产品经理",
-              complete: "已完成",
-            },
-            {
-              course: "外链",
-              name: "如何成为一个产品经理",
-              complete: "已完成",
-            },
-            {
-              course: "讨论",
-              name: "如何成为一个产品经理",
-              complete: "未完成",
-            },
-            {
-              course: "测评",
-              name: "如何成为一个产品经理",
-              complete: "未完成",
-            },
-          ],
-        },
       ],
       stageListActive: 0,
     });
@@ -241,6 +230,9 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if (bool == true) {
+        check();
+      }
     };
     const changeDown = () => {
       state.showDown = !state.showDown;
@@ -248,6 +240,88 @@ export default {
     const changeDown1 = () => {
       state.showDown1 = !state.showDown1;
     };
+    const taskProcessList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          course:
+            value.type == 1
+              ? "在线"
+              : value.type == 2
+              ? "面授"
+              : value.type == 3
+              ? "案例"
+              : value.type == 4
+              ? "作业"
+              : value.type == 5
+              ? "考试"
+              : value.type == 6
+              ? "直播"
+              : value.type == 7
+              ? "外链"
+              : value.type == 8
+              ? "讨论"
+              : value.type == 9
+              ? "活动"
+              : value.type == 10
+              ? "测评"
+              : value.type == 11
+              ? "评估"
+              : value.type == 12
+              ? "投票"
+              : "-",
+          name: value.name,
+          complete:
+            value.status == -1
+              ? "未开始"
+              : value.status == 1
+              ? "已完成"
+              : value.status == 0
+              ? "未完成"
+              : "-",
+          flag: value.flag == 0 ? "选修" : "必修",
+          currentRatio: value.currentRatio,
+          routerTaskId: value.routerTaskId,
+        };
+        array.push(obj);
+      });
+      return array;
+    };
+    const setStageList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          stageName: value.stageName,
+          stageId: value.stageId,
+          taskProcessList: taskProcessList(value.taskProcessList),
+        };
+        array.push(obj);
+      });
+      state.stageList = array;
+    };
+    const check = () => {
+      let obj = {
+        projectId: 37,
+        studentId: 3,
+      };
+      studentProcess(obj).then((res) => {
+        console.log("查看了学员", res.data.data);
+        let result = res.data.data;
+        state.userName = result.userInfoBo.userName;
+        state.deptName = result.userInfoBo.deptName;
+        state.jobName = result.userInfoBo.jobName;
+        state.certCnt = result.certCnt == null ? 0 : result.certCnt;
+        state.name = result.name;
+        state.currentReqCnt = result.currentReqCnt;
+        state.totalReqCnt = result.totalReqCnt;
+        if (result.stageProcessList.length > 0) {
+          setStageList(result.stageProcessList);
+        }
+      });
+    };
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -255,6 +329,9 @@ export default {
       showProMess,
       changeDown,
       changeDown1,
+      check,
+      setStageList,
+      taskProcessList,
       // change,
     };
   },
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f813abf3..163d1cae 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -921,8 +921,8 @@
     <stu-add v-model:Stuvisible="Stuvisible" />
     <!-- 学员管理-导入学员抽屉 -->
     <import-stu v-model:Importvisible="Importvisible" />
-    <!-- 查看学员 -->
-    <see-stu v-model:Seevisible="Seevisible" />
+    <!-- 查看学员 传入查看学员的id-->
+    <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId"/>
     <!-- 学员换组 -->
     <change-group v-model:Changevisible="Changevisible" />
     <!-- 组员名单抽屉 -->
@@ -1545,6 +1545,7 @@ export default {
       noticeContent: "",
       TaskFaceImpStuvisible: false, //批量面授报名
       valuestugn: "", //小组管理的输入的小组名称
+      checkStuId: null, //要查看的学员id
       //进度排行表
       jindutabledata: [
         {
@@ -2294,6 +2295,8 @@ export default {
               class="studentopea2"
               onClick={() => {
                 state.Seevisible = true;
+                console.log(value.studentId, "点击了查看");
+                state.checkStuId = value.studentId;
               }}
             >
               查看

From 868266328b7307369fa217e1a693575ea607399f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Thu, 10 Nov 2022 18:31:06 +0800
Subject: [PATCH 19/90] =?UTF-8?q?fix=EF=BC=9A=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 114 +++++-----------------------
 1 file changed, 17 insertions(+), 97 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index d94cb66d..8948c276 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1096,95 +1096,11 @@ export default {
               total: 50, //总人数
               complete: 20, //完成人数
               percent: 40,
-            },
-            {
-              course: "直播",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-12 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "面授",
-              name: "管理面授课",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 80, //总人数
-              complete: 0, //完成人数
-              percent: 0,
-            },
-            {
-              course: "活动",
-              name: "管理活动",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 40, //完成人数
-              percent: 80,
-            },
-            {
-              course: "作业",
-              name: "管理者作业",
-              classify: "选修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 30, //完成人数
-              percent: 60,
-            },
-            {
-              course: "考试",
-              name: "管理者考试",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 50, //完成人数
-              percent: 100,
-            },
+              routerTaskId:0,
+            }
           ],
-        },
-        {
-          name: "关卡2  中级产品经理",
-          taskList: [
-            {
-              course: "讨论",
-              name: "时间管理",
-              classify: "选修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 20, //完成人数
-              percent: 40,
-            },
-            {
-              course: "测评",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "评估",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "投票",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-          ],
-        },
+        }
+        
       ],
       activeKey: ref("1"),
       value: ref(" "),
@@ -1637,16 +1553,20 @@ export default {
     const myGetRouterDetail = () => {
       GetRouterDetail(state.routerId).then(res => {
         let data = res.data.data.chapterList
-        // state.taskSyllabus = data
-        for(let i in data) {
-          state.taskSyllabus[i].name = data[i].name
-          for(let j in data[i].taskList) {
-            Object.keys(data[i].taskList[j]).forEach(item => {
-            state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
-        })
-          }
-        }
+        state.taskSyllabus = data
+        // for(let i in data) {
+        //   state.taskSyllabus[i].name = data[i].name
+        //   if(data[i].taskList.length > 0) {
+        //     for(let j in data[i].taskList) {
+        //     Object.keys(data[i].taskList[j]).forEach(item => {
+        //     state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
+        // })
+        //   }
+        //   }
+          
+        // }
       }).catch(err => {
+        console.log(err)
         message.error('获取路径列表失败'+err);
       })
 

From 6306599274499f1399f86a87a19c4059ac7bcda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Thu, 10 Nov 2022 18:33:13 +0800
Subject: [PATCH 20/90] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=A8=A1=E6=9D=BF=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexLibrary.js                     | 10 +++
 src/views/projectcenter/TemplateLibrary.vue | 90 +++++++++++++++------
 2 files changed, 75 insertions(+), 25 deletions(-)
 create mode 100644 src/api/indexLibrary.js

diff --git a/src/api/indexLibrary.js b/src/api/indexLibrary.js
new file mode 100644
index 00000000..a5f8feb2
--- /dev/null
+++ b/src/api/indexLibrary.js
@@ -0,0 +1,10 @@
+import http from "./config";
+
+// 获取模板库列表
+export const templateList = obj => http.post('/admin/project/template/list', obj);
+
+// 获取模板详情
+export const templateDetail = id => http.get(`/admin/project/template/detail?projectTemplateId=${id}`);
+
+// 操作模板(撤回,发布,删除) 
+export const templateHadle = obj => http.post(`/admin/project/template/handle`,obj);
\ No newline at end of file
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index 0e4a00e7..0bb54282 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -60,7 +60,9 @@
   </div>
 </template>
 <script>
-import { reactive, defineComponent, toRefs } from "vue";
+import { reactive, defineComponent, toRefs, onMounted } from "vue";
+import { message } from "ant-design-vue";
+import * as api from "@/api/indexLibrary"
 const columns1 = [
   {
     title: "模版名称",
@@ -107,7 +109,7 @@ export default defineComponent({
       tableData1: [
         {
           key: "1",
-          name: "管理者进阶-腾飞班Z1",
+          name: "测试模板1",
           status: "已发布",
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
@@ -115,29 +117,14 @@ export default defineComponent({
         },
         {
           key: "2",
-          name: "管理者进阶-腾飞班Z2",
-          status: "已发布",
-          creator: "毛继禹",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-        },
-        {
-          key: "3",
-          name: "管理者进阶-腾飞班Z3",
-          status: "已发布",
-          creator: "毛继禹",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-        },
-        {
-          key: "4",
-          name: "管理者进阶-腾飞班Z4",
+          name: "测试模板2",
           status: "未发布",
-          creator: "毛继禹",
+          creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
-        },
+        }
       ],
+      // state
     });
     const getTableDate1 = () => {
       let data = state.tableData1;
@@ -150,7 +137,7 @@ export default defineComponent({
                 {value.status === "已发布" ? (
                   <div class="nselect">
                     <div class="ops2">
-                      <router-link to="/libraryadd">
+                      <router-link to="/taskpage">
                         <div class="jc">
                           查看{" "}
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
@@ -158,7 +145,9 @@ export default defineComponent({
                       </router-link>
                     </div>
                     <div class="ops3">
-                      <div class="jc">撤回</div>
+                      <div class="jc"
+                      onClick={() => {templateHadler({"projectTemplateId": value.projectTemplateId,"type": 0})}}
+                      >撤回</div>
                     </div>
                   </div>
                 ) : (
@@ -167,7 +156,8 @@ export default defineComponent({
                 {value.status === "未发布" ? (
                   <div class="nselect">
                     <div class="ops1">
-                      <div class="jc">
+                      <div class="jc"
+                       onClick={() => {templateHadler({"projectTemplateId": value.projectTemplateId,"type": 1})}}>
                         发布
                         <span style="color:#E9E9E9;margin-left:15px;">|</span>
                       </div>
@@ -181,7 +171,9 @@ export default defineComponent({
                       </router-link>
                     </div>
                     <div class="ops3">
-                      <div class="jc">删除</div>
+                      <div class="jc"
+                      onClick={() => {templateHadler({"projectTemplateId": value.projectTemplateId,"type": -1})}}
+                      >删除</div>
                     </div>
                   </div>
                 ) : (
@@ -195,9 +187,57 @@ export default defineComponent({
       state.tableData = data;
     };
     getTableDate1();
+
+    onMounted(() => {
+      getLibraryList();
+    })
+    const getLibraryList = () => {
+      let obj = {
+        "beginTime": 0,
+        "endTime": 0,
+        "name": "",
+        "pageNo": 0,
+        "pageSize": 0,
+        "status": 0
+      }
+      api.templateList(obj).then((res) =>{
+        console.log(res);
+        let resData = res.data.data.rows
+        if(resData.length) {
+          for(let i in resData) { 
+            state.tableData1[i].id = i+1;
+            state.tableData1[i].projectTemplateId = resData[i].projectTemplateId;
+            state.tableData1[i].status = resData[i].status ? "已发布":"未发布" ;
+            state.tableData1[i].name = resData[i].name;
+            state.tableData1[i].creator = resData[i].createName;
+            state.tableData1[i].stutime = resData[i].publishTime;
+            state.tableData1[i].operation = "operation";
+            
+          }
+          
+        } else {
+          message.warning("获取的列表数据为空值")
+        }
+      }).catch((error) => {
+        message.error(`获取模板列表失败`+error)
+      });
+    };
+    const templateHadler = (obj) => {
+      api.templateHadle(obj).then((res) => {
+        if(res.data.success) {
+          message.success(`模板操作成功`)
+          getLibraryList();
+        }
+      }).catch((error) => {
+        message.error(`模板操作失败`+error)
+      })
+    }
+    
+
     return {
       ...toRefs(state),
       columns1,
+      templateHadler,
     };
   },
 });

From cbddd79d4bceb4243fbdf0ab6b0c32489456a874 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 10 Nov 2022 20:10:26 +0800
Subject: [PATCH 21/90] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=A4=96=E9=93=BE?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AE=A8=E8=AE=BA=E9=98=B6=E6=AE=B5=E9=87=8C?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=87=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexActivity.js                  |   2 +-
 src/api/indexDiscuss.js                   |   8 +-
 src/api/indexExternalChain.js             |   7 +-
 src/components/drawers/AddActive.vue      | 242 +++++++--------
 src/components/drawers/AddDiscuss.vue     | 233 ++++++---------
 src/components/drawers/AddLive.vue        | 255 ++++++++++------
 src/components/drawers/AddRef.vue         | 335 +++++----------------
 src/views/learningpath/LevelAddDetail.vue | 343 +++++++++-------------
 src/views/projectcenter/TaskAdd.vue       | 170 ++---------
 9 files changed, 608 insertions(+), 987 deletions(-)

diff --git a/src/api/indexActivity.js b/src/api/indexActivity.js
index 8adaca20..9b1c566f 100644
--- a/src/api/indexActivity.js
+++ b/src/api/indexActivity.js
@@ -1,7 +1,7 @@
 import http from "./config";
 
 //获取活动信息接口
-export const getActivity = (obj) => http.get('/activity', { params: obj });
+export const getActivity = (activeId) => http.get(`/activity?activityId=${activeId}`);
 
 //创建活动接口
 export const createActivity = (obj) => http.post('/activity/createActivity', obj);
diff --git a/src/api/indexDiscuss.js b/src/api/indexDiscuss.js
index f9e07d46..7d8866ed 100644
--- a/src/api/indexDiscuss.js
+++ b/src/api/indexDiscuss.js
@@ -5,8 +5,12 @@ import http from "./config";
 export const createDiscuss = (obj) => http.post("/discuss/createDiscuss", obj);
 
 //获取讨论信息接口
-export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj);
-
+export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj,{
+  headers: {
+    'token': '123',
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+  }
+})
 //删除讨论接口
 export const deleteDiscuss = (obj) =>
   http.post("/discuss/deleteDiscuss", { params: obj });
diff --git a/src/api/indexExternalChain.js b/src/api/indexExternalChain.js
index 6bc219d3..aacc2f8b 100644
--- a/src/api/indexExternalChain.js
+++ b/src/api/indexExternalChain.js
@@ -15,7 +15,12 @@ export const deleteLink = (obj) => http.post('/link/deleteLink', { params: obj }
 })
 
 //获取外链详细信息接口
-export const getLink = (obj) => http.post('/link/getOne', obj)
+export const getLink = (obj) => http.post('/link/getOne', obj,{
+  headers: {
+    'token': '123',
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+  }
+})
 
 // 更新外链数据
 export const updateLinks = (obj) => http.post('/link/updateLinks', obj, {
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index a520aab3..a5de57fd 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -9,8 +9,8 @@
   >
     <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"
@@ -217,7 +217,7 @@
         </div>
       <div class="main_btns">
           <button class="btn1" @click="closeDrawer">取消</button>
-          <button class="btn2" @click="createActivity">确定</button>
+          <button class="btn2" @click="updateActivityInfo">确定</button>
         </div>
     </div>
   </a-drawer>
@@ -228,7 +228,7 @@ import * as api from "../../api/indexActivity";
 import * as apiTask from "../../api/indexTaskadd";
 import { RouterEditTask } from "@/api/indexTask"
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method.js";
+import dayjs from 'dayjs';
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -254,16 +254,12 @@ export default {
       type: Boolean,
       default: false,
     },
-    isStudiscuss: {
-      type: Boolean,
-      default: false,
-    },
-    isactive: {
+    EditActiveId: {
       type: Number,
       default: null,
     },
-    routerId: {
-      type: Number,
+    edit: { //  是否为编辑
+      type: Boolean,
       default: null,
     },
     projectId: {
@@ -274,17 +270,29 @@ export default {
       type: Number,
       default: null,
     },
-    edit: {
-      type: Boolean,
-      default: false,
+    routerTaskId: {
+      type: Number,
+      default: 0,
     },
-    editActivityId: {
+    isLevel: { // 是否是关卡页面触发
       type: Boolean,
-      default: false,
+      default: null,
     },
-    projectTaskId: {
-      type: Boolean,
-      default: false,
+    EditWorkId: { // 要编辑的workId 
+      type: Number,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
     }
   },
   setup(props, ctx) {
@@ -314,49 +322,74 @@ export default {
       state.textV1 = "";
       state.textV2 = "";
       state.time = "";
+      message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+      ctx.emit("changeData", false);
     };
+    const queryActive = () => {
+      console.log("props.EditActiveId======",props.EditActiveId,props.chooseStageId,props.routerTaskId);
+        api.getActivity(props.EditActiveId).then(res => {
+          console.log('获取讨论信息成功',res.data.data)
+          
+          //更新讨论信息
+          state.inputV1 =  res.data.data.activityName;
+          state.textV1 = res.data.data.activityNotice;
+          state.textV2 = res.data.data.activityExplain;
+          state.inputV2 = res.data.data.activityDuration;
+          state.inputV3 = res.data.data.activityAddress;
+          state.inputV5 = res.data.data.afterSignIn;
+          state.inputV4 = res.data.data.beforeSignIn;
+          state.radioV1 = res.data.data.standardSettings;
+          state.time = [dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD")]
+        }).catch(err=>{
+          console.log('获取讨论信息失败',err)
+        })
+    }
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-      console.log("活动ID",props.editActivityId);
-      console.log("项目中任务ID",props.projectTaskId);
-      if(bool){
-        if(props.isStudiscuss == false){
-          if(props.edit){
-            //编辑讨论
-              console.log("props.editActivityId",props.editActivityId)
-                let obj = {
-                  activityId: props.editActivityId,
-                }
-                api.getActivity(obj).then(res => {
-                  console.log('获取讨论信息成功',res.data.data)
-                  
-                  //更新讨论信息
-                  state.inputV1 =  res.data.data.activityName;
-                  state.textV1 = res.data.data.activityNotice;
-                  state.textV2 = res.data.data.activityExplain;
-                  state.inputV2 = res.data.data.activityDuration;
-                  state.inputV3 = res.data.data.activityAddress;
-                  state.inputV5 = res.data.data.afterSignIn;
-                  state.inputV4 = res.data.data.beforeSignIn;
-                  state.radioV1 = res.data.data.standardSettings;
-                  state.time[0] = res.data.data.activityStartTime;
-                  state.time[1] = res.data.data.activityEndTime;
-                  console.log(state.time[0])
-                }).catch(err=>{
-                  console.log('获取讨论信息失败',err)
-                })
-            
-          }
-        }
+      if(bool && props.edit){
+        queryActive();
       }
+      
     };
     const cloradio1 = (value) => {
       if (value != "") {
         state.radioV1 = "";
       }
     };
+    const updateTask = (res) => {
+      if(props.isLevel){
+        RouterEditTask({
+            chapterId:props.isactive,
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            routerId: props.routerId,
+            routerTaskId: props.routerTaskId,
+            type: 9,
+          }).then(res => {
+            console.log("新增关卡任务成功",res);
+            
+          }).catch(err => {
+            console.log("新增关卡任务失败",err);
+          })
+      }else{
+        apiTask.addTask({
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId,
+            stageId:props.chooseStageId,
+            type: 9,
+          }).then((res)=> {
+            console.log("更新任务列表成功",res);
+          })
+          .catch((err)=> {
+            console.log("更新任务列表失败",err);
+          })
+      }
+    }
     //创建活动
-    const createActivity = () => {
+    const updateActivityInfo = () => {
       if(!state.inputV1){
         message.destroy();
         return message.warning("请输入活动名称");
@@ -377,17 +410,16 @@ export default {
         message.destroy();
         return message.warning("请输入活动地址");
       } 
-      let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D");
-      let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D");
+     
       let obj = {
           activityAddress: state.inputV3, //活动地址
           activityDuration: state.inputV2, //活动时长
           activityExplain: state.textV2, //活动说明
-          activityEndTime: endTime, //活动结束时间
-          activityId: 0, //活动ID
+          activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
+          activityId: props.edit?props.EditActiveId:0, //活动ID
           activityName: state.inputV1, //活动名称
           activityNotice: state.textV1, //活动公告
-          activityStartTime: startTime, //活动开始时间
+          activityStartTime:dayjs(state.time[0]).format("YYYY-MM-DD"),//活动开始时间
           activityTag: "", //活动逻辑删除标识
           afterSignIn: state.inputV5, //活动开始后多少分钟签到
           beforeSignIn: state.inputV4, //活动开始前多少分钟签到
@@ -397,67 +429,23 @@ export default {
       };
       if(props.edit){
         //更新编辑活动信息
-        updateActivity();
+        api
+        .updateActivity(obj)
+        .then((res) => {
+          closeDrawer();
+          updateTask(res);
+      })
+      .catch((err) => {
+        console.log("更新失败",err);
+      })
       }else{
         //新建活动信息
         api
         .createActivity(obj)
         .then((res) => {          
-            console.log("创建成功", res);
             message.success("创建成功");
-            state.radioV1 = "";
-            state.inputV1 = "";
-            state.inputV2 = "";
-            state.inputV3 = "";
-            state.inputV4 = "";
-            state.inputV5 = "";
-            state.inputV6 = "";
-            state.textV1 = "";
-            state.textV2 = "";
-            state.time = "";
-            ctx.emit("update:addactiveVisible", false);
-            console.log("学习路径",props.isStudiscuss);
-            if(props.isStudiscuss){
-              let editObj1 = {
-              chapterId:props.isactive,
-              courseId: 0,
-              duration: obj.activityDuration,
-              flag: true,
-              name: obj.activityName,
-              routerId: props.routerId,
-              routerTaskId: 0,
-              type: 9,
-            }
-              RouterEditTask(editObj1).then(res => {
-              console.log("新增关卡任务成功",res);
-              closeDrawer();
-            }).catch(err => {
-              console.log("新增关卡任务失败",err);
-            })
-            }else{
-              apiTask
-              .addTask({
-                courseId: res.data.data.activityId,
-                duration: obj.activityDuration,
-                flag: true,
-                name: obj.activityName,
-                projectId: props.projectId,
-                projectTaskId: 0,
-                stageId: props.chooseStageId,
-                type: 9,
-              })
-              .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                ctx.emit("changeData", false);
-                //重新获取任务列表
-                // apiTask.getTask({ projectId: 28 });
-                // router.push("/taskadd");
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-            }
-            
+            closeDrawer();
+            updateTask(res);
         })
         .catch((err) => {
           console.log("创建失败",err);
@@ -465,40 +453,14 @@ export default {
       }
       
     };
-    //更新编辑活动信息
-    const updateActivity = (obj) => {
-      console.log("编辑");
-      api.updateActivity(obj)
-      .then((res) => {
-        console.log("更新成功",res);
-        let taskObj = {
-          courseId: res.data.data.activityId,
-          duration: obj.activityDuration,
-          flag: true,
-          name: obj.activityName,
-          projectId: props.projectId,
-          projectTaskId: props.projectTaskId,
-          stageId: 0,
-          type: 9,
-        }
-        api.updateTask(taskObj).then((res)=> {
-          console.log("更新任务列表成功",res);
-        })
-        .catch((err)=> {
-          console.log("更新任务列表失败",err);
-        })
-      })
-      .catch((err) => {
-        console.log("更新失败",err);
-      })
-    };
+  
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
       cloradio1,
-      createActivity,
+      updateActivityInfo,
     };
   },
 };
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index ccaaad30..7e29da4d 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -8,8 +8,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"
@@ -57,19 +56,17 @@
               <span style="margin-right: 3px">讨论设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1">允许评论</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @onclick = "checkedC1=!checkedC1">允许评论</a-checkbox>
             </div>
           </div>
         </div>
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createDiscuss">确定</button>
+        <button class="btn2" @click="updateDiscussInfo">确定</button>
       </div>
     </div>
-     <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
-    <a-spin :spinning="addLoading" tip="添加中..." />
-  </div>
+  
   </a-drawer>
 </template>
 <script>
@@ -103,20 +100,12 @@ export default {
       type: Boolean,
       default: false,
     },
-    edit: {
-      type: Boolean,
-      default: false,
-    },
-    isStudiscuss: {
-      type: Boolean,
-      default: false,
-    },
-    isactive: {
+    EditDiscussId: {
       type: Number,
       default: null,
     },
-    routerId: {
-      type: Number,
+    edit: { //  是否为编辑
+      type: Boolean,
       default: null,
     },
     projectId: {
@@ -127,11 +116,27 @@ export default {
       type: Number,
       default: null,
     },
-    editDiscussId: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
       type: Number,
       default: null,
     },
-    projectTaskId: {
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
       type: Number,
       default: null,
     }
@@ -142,157 +147,113 @@ export default {
       inputV1: "",
       inputV2: "",
       textV1: "",
-      checkedC1: "",
+      checkedC1: false,
       addLoading:false,
     });
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
       ctx.emit("update:edit", false);
-      console.log("编辑状态",props.edit);
       state.inputV1 = "";
       state.textV1 = "";
+      message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+      ctx.emit("changeData", false);
+    };
+    const queryDiscuss = () =>{
+      if(props.edit){
+            //编辑讨       
+        api.getDiscussDetail({discussId:props.EditDiscussId}).then(res => {
+          console.log('获取讨论信息成功',res.data.data)
+          //更新讨论信息
+          state.inputV1 = res.data.data.discussName;
+          state.textV1 = res.data.data.discussExplain;
+          state.checkedC1 = Boolean(res.data.data.discussSettings);
+          console.log("props.EditDiscussId",res.data.data.discussSettings,state.checkedC1==Boolean(res.data.data.discussSettings),Boolean(res.data.data.discussSettings),state.checkedC1)
+        }).catch(err=>{
+          console.log('获取讨论信息失败',err)
+        })
+    
+     }
     };
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-      console.log("项目任务ID",props.projectTaskId);
       if(bool){
-        if(props.isStudiscuss == false){
-          if(props.edit){
-            //编辑讨论
-              console.log("props.editDiscussId",props.editDiscussId)
-                let formData = new FormData();
-                formData.append('discussId',props.editDiscussId);
-                console.log("formData",formData);
-                api.getDiscussDetail(formData).then(res => {
-                  console.log('获取讨论信息成功',res.data.data)
-                  //更新讨论信息
-                  state.inputV1 = res.data.data.discussName;
-                  state.textV1 = res.data.data.discussExplain;
-                  state.checkedC1 = res.data.data.discussSettings;
-                }).catch(err=>{
-                  console.log('获取讨论信息失败',err)
-                })
-            
-          }
-        }
+        queryDiscuss();
       }
     };
-    //console.log("编辑状态",props.edit);
-    //创建讨论（项目任务列表）
-    const createDiscuss = () => {
+    const updateTask = (res) => {
+    console.log("jinlaile ========",props.isLevel);
+        if(props.isLevel){
+          RouterEditTask({
+            chapterId:props.isactive,
+            courseId: res.data.data.discussId,
+            name: res.data.data.discussName,
+            routerId: props.routerId,
+            routerTaskId: props.routerTaskId,
+            type: 8,
+          }).then(res => {
+              closeDrawer();
+              console.log("新增关卡任务失败",res);
+          }).catch(err => {console.log("新增关卡任务失败",err);})
+        }else{
+        apiTask
+        .updateTask({
+          courseId: res.data.data.discussId,
+          name: res.data.data.discussName,
+          projectId: props.projectId,
+          projectTaskId: props.projectTaskId,
+          stageId: props.stageId,
+          type: 8,       
+        }).then(r=>{
+          closeDrawer();
+          console.log("新增关卡任务成功",r);
+        }).catch(r=>{
+          console.log('更新阶段任务失败',r)
+        })
+        }
+    }
+    const updateDiscussInfo = () => {
       if (!state.inputV1) {
         message.destroy();
         return message.warning("请输入讨论名称");
       }
-      state.addLoading=true
       let obj = {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明
-        discussSettings: state.checkedC1, //讨论设置
-        createTime: "", //创建时间
-        createUser: 0, //创建人
-        discussFlag: "", //活动逻辑删除标识
-        discussId: props.editDiscussId == null ? 0 : props.editDiscussId, //讨论Id
-        discussTag: "", //是否必修的标识
-        updateTime: "", //更新时间
-        updateUser: 0, //更新人
-        projectId: props.projectId, //项目id
+        discussSettings: String(state.checkedC1), //讨论设置
+        discussId: props.edit?props.EditDiscussId:0,//讨论Id
+        projectId: 0, //项目id,接口多余字段，
       };
-      if(props.edit == false){
-        api
-        .createDiscuss(obj)
-        .then((res) => {
-          console.log("创建成功", res);
-          state.inputV1 = "";
-          state.textV1 = "";
-         
-          //console.log("discussName",obj.discussName);
-          console.log("学习路径",props.isStudiscuss);
-          if(props.isStudiscuss){
-            let editObj1 = {
-              chapterId:props.isactive,
-              courseId: res.data.data.discussId,
-              duration: 0,
-              flag: true,
-              name: obj.discussName,
-              routerId: props.routerId,
-              routerTaskId: 0,
-              type: 8,
-            }
-            RouterEditTask(editObj1).then(res => {
-              console.log("新增关卡任务成功",res);
-              setTimeout(()=>{
-                 message.success("创建成功");
-                ctx.emit("update:adddiscussVisible", false);
-              state.addLoading=false
-              },1000)
-            }).catch(err => {
-              console.log("新增关卡任务失败",err);
-            })
-          }else{
-            console.log("项目添加讨论");
-            apiTask
-            .addTask({
-              courseId: res.data.data.discussId,
-              duration: 0,
-              flag: true,
-              name: obj.discussName,
-              projectId: props.projectId,
-              projectTaskId: "",
-              stageId: props.chooseStageId,
-              type: 8,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后", res.data);
-              ctx.emit("changeData",false);
-              //重新获取任务列表
-              // apiTask.getTask({ projectId: 28 });
-              // router.push("/taskadd");
-              state.addLoading=false
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-          }
-         })
-        .catch((err) => {
-          console.log("创建失败", err);
-        }); 
-      }else{
+      console.log("dianwanle -======",String(state.checkedC1));
+      if(props.edit){
         api
           .updateDiscuss(obj)
           .then((res)=> {
+            updateTask(res);
             console.log("更新成功",res);
             console.log("项目任务ID",props.projectTaskId)
-          let taskObj={
-            courseId: res.data.data.discussId,
-            name: obj.discussName,
-            projectId: props.projectId,
-            projectTaskId: props.projectTaskId,
-            stageId: props.stageId,
-            type: 8,
-          
-          }
-            api.updateTask(taskObj).then(taskRes=>{
-            console.log('更新阶段任务成功',taskRes)
-            }).catch(taskErr=>{
-              console.log('更新阶段任务失败',taskErr)
-            })
           })
           .catch((err) => {
-            console.log("更新失败",err)
+              console.log("更新失败",err)
           })
+       }else{
+        api
+        .createDiscuss(obj)
+        .then((res)=> {
+          updateTask(res);
+          console.log("创建成功",res);
+          console.log("项目任务ID",props.projectTaskId)
+        })
+        .catch((err) => {
+          console.log("创建失败",err)
+        })
       }
-         
-         
     };
-    
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
-      createDiscuss,
+      updateDiscussInfo,
+      
     };
   },
 };
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index d7e04481..a8f7efb8 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -10,7 +10,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加直播</div>
+        <div class="headerTitle">{{edit?'编辑':'添加'}}直播</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -80,10 +80,14 @@
               <span style="margin-right: 3px">直播时长：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                v-model:value="inputV2"
-                style="width: 388px; height: 32px"
-              />
+              <a-input-number
+                    :min="0"
+                    :max="300"
+                    :precision="0"
+                    style=" width: 388px; height: 32px; border-radius: 8px;overflow: hidden; "
+                    v-model:value="inputV2"
+                  ></a-input-number>
+            
               <span style="margin-left: 5px">分钟</span>
             </div>
           </div>
@@ -110,6 +114,9 @@
               <span style="margin-right: 3px">直播封面：</span>
             </div>
             <div class="textarea" style="overflow: hidden">
+           
+            
+       
               <a-upload
                 v-model:file-list="fileList"
                 name="avatar"
@@ -120,7 +127,7 @@
                 :before-upload="beforeUpload"
                 @change="handleChange"
               >
-                <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
+                <img v-if="imageUrl" :src="imageUrl" alt="avatar" style=“width：100px；height:100px;”/>
                 <div v-else>
                   <loading-outlined v-if="loading"></loading-outlined>
                   <plus-outlined v-else></plus-outlined>
@@ -170,7 +177,7 @@
               <span style="margin-right: 3px">评价：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1">需要评估</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @onclick = 'checkedC1=!checkedC1'>需要评估</a-checkbox>
             </div>
           </div>
           <div class="main_item" style="margin-top: -25px">
@@ -201,12 +208,7 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
+                    style="width: 88px; height: 32px; border-radius: 8px;overflow: hidden; "
                     v-model:value="inputV6"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -217,12 +219,7 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
+                    style="width: 88px;height: 32px;border-radius: 8px; overflow: hidden;"
                     v-model:value="inputV7"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -238,12 +235,7 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
+                    style=" width: 88px;height: 32px;border-radius: 8px; overflow: hidden; "
                     v-model:value="inputV8"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
@@ -271,7 +263,7 @@
               <span style="margin-right: 3px">其他设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC2"
+              <a-checkbox v-model:checked="checkedC2" @onclick = "checkedC2 = !checkedC2"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -280,7 +272,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createLiveBroadcast">确定</button>
+        <button class="btn2" @click="updateLiveBroadcast">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -292,6 +284,7 @@ import * as api from "../../api/indexLiveBroadcast";
 import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
 import { RouterEditTask } from "@/api/indexTask";
+import dayjs from 'dayjs';
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
   const reader = new FileReader();
@@ -330,10 +323,15 @@ export default {
       type: Boolean,
       default: false,
     },
-    isStudy: {
+  
+    EditLiveId: {
       type: Number,
       default: null,
     },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -342,6 +340,31 @@ export default {
       type: Number,
       default: null,
     },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
+      type: Number,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -447,13 +470,15 @@ export default {
       imageUrl: "", //上传图片地址
       loading: false,
       switchC1: "",
-      checkedC1: "",
-      checkedC2: true,
+      checkedC1: false,
+      checkedC2: false,
       playback: false,
+      assessmentId:"0",
       obj: {}, //要传的obj数据
     });
     const closeDrawer = () => {
-      ctx.emit("update:addliveVisible", false);
+      ctx.emit("update:addliveVisible", false); 
+      ctx.emit("update:edit", false);
       console.log(props, "props");
       state.radioV1 = "";
       state.playback = false;
@@ -471,7 +496,37 @@ export default {
       state.imageUrl = "";
     };
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+      console.log("props.edit===================", props.edit,bool);
+      if(props.edit){
+        queryLive();
+
+      }
+    };
+    const queryLive = () => {
+      let d =props.EditLiveId;
+      console.log("直播查询=======",d);
+      api
+      .getLiveBroadcastInfor({liveId:d}).then((res) => {
+       // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+        state.inputV1 = res.data.data.liveName;
+        state.time = [dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"), dayjs(res.data.data.liveEndTime, "YYYY-MM-DD")]
+        state.inputV2= res.data.data.liveDuration;
+        state.inputV3= res.data.data. liveTeacherId;
+        //state.fileList= res.data.data
+        state.inputV4= res.data.data.liveLink;
+        state.inputV5= res.data.data.livePlaybackLink;
+        state.inputV6= res.data.data.beforeSignIn;
+        state.inputV7= res.data.data.afterSignIn;
+        state.inputV8= res.data.data.signOutTime;
+        state.textV1= res.data.data.liveExplain;
+        state.radioV1= res.data.data.standardSettings
+        //state.= res.data.data
+       
+       
+        console.log("查询成功=====inputv1",state.inputV1);
+      }).catch(() => {
+        message.error(`查询失败`)
+      })
     };
     const PlayBack = () => {
       state.playback = !state.playback;
@@ -482,6 +537,7 @@ export default {
         state.radioV1 = "";
       }
     };
+ 
     const handleChange = (info) => {
       if (info.file.status === "uploading") {
         state.loading = true;
@@ -519,9 +575,50 @@ export default {
 
       return isJpgOrPng && isLt2M;
     };
-
+    const updateTask =(res)=>{
+      if(props.isLevel){
+            RouterEditTask({
+              chapterId: props.isactive,
+              courseId: res.data.data.liveId,
+              duration: res.data.data.duration,
+              name: res.data.data.liveName,
+              routerId: props.routerId,
+              routerTaskId: props.routerTaskId || 0,
+              type: 6,
+            })
+              .then((res) => {
+                console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+          }else{
+            apiTask
+              .addTask({
+                courseId: res.data.data.liveId,
+                duration: res.data.data.duration,
+                name: res.data.data.liveName,
+                projectId: props.projectId,
+                projectTaskId: props.projectTaskId || 0,
+                stageId: props.chooseStageId,
+                type: 6,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+             
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+         
+          }
+    }
     //创建直播
-    const createLiveBroadcast = () => {
+    const updateLiveBroadcast = () => {
       if (!state.inputV1) {
         message.destroy();
         return message.warning("请输入直播名称");
@@ -541,11 +638,8 @@ export default {
       }
 
       if (!state.inputV3) return message.warning("请输入授课老师");
-      let check = state.checkedC2 * 1;
-      // let startTime = state.time[0].$d;
-      // let endTime = state.time[1].$d;
-      // console.log(startTime); //时间需要处理
-      // console.log(endTime);
+   
+      //let check = state.checkedC2 ;
       let startTime = toDate(
         new Date(state.time[0].$d).getTime() / 1000,
         "Y-M-D"
@@ -554,90 +648,61 @@ export default {
         new Date(state.time[1].$d).getTime() / 1000,
         "Y-M-D"
       );
-
+    
+    
       state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
         assessmentId: 0,
-        createTime: "",
-        createUser: 0,
         // liveCover: state.fileList,//直播封面
         liveDuration: state.inputV2,
         liveEndTime: endTime,
         liveStartTime: startTime,
         liveExplain: state.textV1,
         liveFlag: "",
-        liveId: 0,
+        liveId: props.edit?props.EditLiveId:0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
         livePlayback: "",
         livePlaybackLink: state.inputV5,
         liveTag: "",
-        liveTeacherId: 0,
-        otherSettings: check, //1或0
+        liveTeacherId: state.inputV3,
+        otherSettings:0, //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
-        updateTime: "",
-        updateUser: 0,
+    
       };
-      let name = state.inputV1;
-      api
+     console.log("zhibo-==========",props.EditLiveId);
+      if(props.edit){
+        api
+        .updateLiveBroadcastMessage(state.obj)
+        .then((res) => {
+          console.log("直播编辑成功", res.data.data);
+          message.success("提交成功");
+          updateTask(res);
+          closeDrawer();              
+        })
+        .catch((err) => {
+          console.log(err, 2222);
+        });
+      }else{
+        api
         .createLiveBroadcast(state.obj)
         .then((res) => {
           console.log("调用添加直播接口后", res.data.data);
           // console.log(state, 2222);
           message.success("提交成功");
-          closeDrawer();
-
-          if (props.isStudy == 1) {
-            console.log("hhhhh", name);
-            let objj = {
-              chapterId: 36,
-              courseId: 0,
-              duration: state.obj.liveDuration,
-              flag: true,
-              name: name,
-              routerId: 92,
-              routerTaskId: 0,
-              type: 6,
-            };
-            RouterEditTask(objj)
-              .then((res) => {
-                console.log(res, 11111);
-              })
-              .catch((err) => {
-                console.log(err, 1111);
-              });
-          } else {
-            apiTask
-              .addTask({
-                courseId: 0,
-                duration: state.obj.liveDuration,
-                flag: true,
-                name: state.obj.liveName,
-                projectId: props.projectId,
-                projectTaskId: 0,
-                stageId: props.chooseStageId,
-                type: 6,
-              })
-              .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                //自定义事件给父组件传值
-                ctx.emit("changeData", false);
-                //重新获取任务列表
-                // apiTask.getTask({ projectId: 28 });
-                // router.push("/taskadd");
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          }
+          updateTask(res);
+          closeDrawer();   
         })
         .catch((err) => {
           console.log(err, 2222);
         });
+      }
+    
     };
 
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -647,9 +712,9 @@ export default {
       // columns1,
       rowSelection,
       cloradio1,
-      createLiveBroadcast,
       handleChange,
       beforeUpload,
+      updateLiveBroadcast,
     };
   },
 };
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 4ce041f5..e7b28d2e 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ title }}外链</div>
+        <div class="headerTitle">{{edit ? '编辑' : '添加' }}外链</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -73,13 +73,13 @@
       </a-form>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createExternalChain">确定</button>
+        <button class="btn2" @click="updateRef">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref, onMounted } from "vue";
+import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexExternalChain";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
@@ -110,10 +110,14 @@ export default {
       type: Boolean,
       default: false,
     },
-    isStudy: {
+    EditRefId: {
       type: Number,
       default: null,
     },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -122,15 +126,19 @@ export default {
       type: Number,
       default: null,
     },
-    isRefEdit: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
       type: Number,
       default: null,
     },
-    EditRefId: {
-      type: Number,
-      default: null,
-    },
-    isactive: {
+    projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
     },
@@ -138,6 +146,11 @@ export default {
       type: Number,
       default: null,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  
   },
   setup(props, ctx) {
     const state = reactive({
@@ -149,286 +162,103 @@ export default {
     const closeDrawer = () => {
       console.log(props, 1111);
       ctx.emit("update:addrefVisible", false);
-      ctx.emit("update:isRefEdit", 1);
+      ctx.emit("update:edit", false);
       console.log("props", props.routerId);
       state.inputV2 = "";
       state.inputV1 = "";
       state.textV1 = "";
     };
-    const updateRef = () => {
-        // 如果是关卡页面进入 ---------------------------------
-      if (props.isLevel) {
-        if(props.isRefEdit){
-          createExternalRef();
 
-        }else{
-          updateExternalRef();
-        }
-        console.log('关卡创建任务***************');
-      } else { // 任务页面进入------------------------------
-        if (props.isRefEdit) { // 编辑任务
-          console.log('编辑任务***************');
-          updateExternalChain();
-        } else {  // 创建任务
-          console.log('创建任务***************');
-          createExternalChain();
-        }
-      }
-       
-     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      queryRef();
+  
+      if(props.edit){
+        queryRef();
+      }
+      
     };
     const handleFinish = values => {
       console.log(values);
-      updateRef(props.EditRefId)
+      //updateRef(props.EditRefId)
     };
     const handleFinishFailed = errors => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
-    //创建外链
-    const createExternalChain = () => {
-      if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2) return message.warning("请输入链接");
-      let obj = {   
-        linkAddress: state.inputV2,
-        linkDescription: state.textV1,
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1, 
-      };
-      //编辑外链
- 
-      api
-        .createExternalChain(obj)
-        .then((res) => {
-          console.log(res.data.data, "外链添加成功了");
-          message.success("提交成功");
-          closeDrawer();
-    
-          //项目的创建
-          apiTask
-            .addTask({
+    const updateTask =(res)=>{
+      console.log("jinlaile=================",res.data.data.linkId,props.isLevel,props.isactive,props.routerId,props.routerTaskId)
+      if(props.isLevel){
+        RouterEditTask({
+              chapterId: props.isactive,
               courseId: res.data.data.linkId,
-              duration: 0,
-              flag: true,
-              name: obj.linkName,
+              name: res.data.data.linkName,
+              routerId: props.routerId,
+              routerTaskId: props.routerTaskId || 0,
+              type: 7,
+            })
+              .then((res) => {
+                console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+                closeDrawer();
+                state.addLoading = false;               
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+      }else{
+        apiTask
+            .addTask({
+              courseId:res.data.data.linkId,
+              name: res.data.data.linkName,
               projectId: props.projectId,
-              projectTaskId: 0,
+              projectTaskId: props.projectTaskId || 0,
               stageId: props.chooseStageId,
               type: 7,
             })
             .then((res) => {
               console.log("调用项目添加接口后111", res.data, 11111);
-              ctx.emit("changeData", false);
-              //重新获取任务列表
-              // apiTask.getTask({ projectId: 28 });
-              // router.push("/taskadd");
+              ctx.emit("changeData", false); 
+              closeDrawer();    
             })
             .catch((err) => {
               console.log(err, 111111);
             });
-          
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-      
-    };
-    const updateExternalChain = () => {
+      }
+    }
+    //创建外链
+    const updateRef = () => {
       if (!state.inputV1) return message.warning("请输入外链名称");
       if (!state.inputV2) return message.warning("请输入链接");
-      let obj = {
-    
+      let obj = {   
         linkAddress: state.inputV2,
         linkDescription: state.textV1,
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1,
-      
+        linkId:props.edit?props.EditRefId:0,
+        linkName: state.inputV1, 
       };
-    
-      //编辑外链
-      api
+      console.log("编辑的id========",props.EditRefId)
+      if(props.edit){
+        api
         .updateLinks(obj)
         .then((res) => {
-          console.log("编辑成功", res);
           message.success("编辑成功");
-          closeDrawer();
-        })
-        .catch((err) => console.log(err));
+          updateTask(res);  
+        }).catch((err) => console.log(err));
+      }else{
+        api
+        .createExternalChain(obj)
+        .then((res) => {
+          message.success("提交成功");
+          updateTask(res);                
+        }).catch((err) => console.log(err));
+      }
       
-    };
-    const createExternalRef = () => {
-      if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2) return message.warning("请输入链接");
-      let obj = {
-        createUser: 0,
-        createTime: "",
-        linkAddress: state.inputV2,
-        linkDescription: state.textV1,
-        linkFlag: "",
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1,
-        linkTag: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-    
-      //编辑外链
-      if (props.isRefEdit) {
-        api
-          .updateLinks(obj)
-          .then((res) => {
-            console.log("编辑成功", res);
-            message.success("编辑成功");
-            closeDrawer();
-          })
-          .catch((err) => console.log(err));
-      } else {
-        api
-          .createExternalChain(obj)
-          .then((res) => {
-            console.log(res.data.data, "外链添加成功了");
-            message.success("提交成功");
-            closeDrawer();
-            //学习路径的创建
-            if (props.isStudy == 1) {
-              let objj = {
-                chapterId: props.isactive,
-                courseId: res.data.data.linkId,
-                duration: 0,
-                flag: true,
-                name: obj.linkName,
-                routerId: props.routerId,
-                routerTaskId: 0,
-                type: 7,
-              };
-              RouterEditTask(objj)
-                .then((res) => {
-                  console.log(res, 11111);
-                })
-                .catch((err) => {
-                  console.log(err, 1111);
-                });
-            } else {
-              //项目的创建
-              apiTask
-                .addTask({
-                  courseId: res.data.data.linkId,
-                  duration: 0,
-                  flag: true,
-                  name: obj.linkName,
-                  projectId: props.projectId,
-                  projectTaskId: 0,
-                  stageId: props.chooseStageId,
-                  type: 7,
-                })
-                .then((res) => {
-                  console.log("调用项目添加接口后111", res.data, 11111);
-                  ctx.emit("changeData", false);
-                  //重新获取任务列表
-                  // apiTask.getTask({ projectId: 28 });
-                  // router.push("/taskadd");
-                })
-                .catch((err) => {
-                  console.log(err, 111111);
-                });
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      }
-    };
-    const updateExternalRef = () => {
-      if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2) return message.warning("请输入链接");
-      let obj = {
-        createUser: 0,
-        createTime: "",
-        linkAddress: state.inputV2,
-        linkDescription: state.textV1,
-        linkFlag: "",
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1,
-        linkTag: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-    
-      //编辑外链
-      if (props.isRefEdit) {
-        api
-          .updateLinks(obj)
-          .then((res) => {
-            console.log("编辑成功", res);
-            message.success("编辑成功");
-            closeDrawer();
-          })
-          .catch((err) => console.log(err));
-      } else {
-        api
-          .createExternalChain(obj)
-          .then((res) => {
-            console.log(res.data.data, "外链添加成功了");
-            message.success("提交成功");
-            closeDrawer();
-            //学习路径的创建
-            if (props.isStudy == 1) {
-              let objj = {
-                chapterId: 36,
-                courseId: 0,
-                duration: 0,
-                flag: true,
-                name: obj.linkName,
-                routerId: 92,
-                routerTaskId: 0,
-                type: 7,
-              };
-              RouterEditTask(objj)
-                .then((res) => {
-                  console.log(res, 11111);
-                })
-                .catch((err) => {
-                  console.log(err, 1111);
-                });
-            } else {
-              //项目的创建
-              apiTask
-                .addTask({
-                  courseId: res.data.data.linkId,
-                  duration: 0,
-                  flag: true,
-                  name: obj.linkName,
-                  projectId: props.projectId,
-                  projectTaskId: 0,
-                  stageId: props.chooseStageId,
-                  type: 7,
-                })
-                .then((res) => {
-                  console.log("调用项目添加接口后111", res.data, 11111);
-                  ctx.emit("changeData", false);
-                  //重新获取任务列表
-                  // apiTask.getTask({ projectId: 28 });
-                  // router.push("/taskadd");
-                })
-                .catch((err) => {
-                  console.log(err, 111111);
-                });
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      }
     };
         // 查询任务
     const queryRef = () => {
-      let p =new FormData;
-      p.append('linkId',props.EditRefId);
+      let d =props.EditRefId ;
       api
-      .getLink(p).then((res) => {
+      .getLink({linkId:d}).then((res) => {
        // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
         state.inputV1 = res.data.data.linkName;
         state.inputV2 =res.data.data.linkAddress;
@@ -438,16 +268,11 @@ export default {
         message.error(`查询失败`)
       })
     };
-    //不生效
-    onMounted(() => {
-      state.title = props.isRefEdit == 2 ? "编辑" : "添加";
-    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
-      createExternalChain,
       handleFinish,
       handleFinishFailed,
       updateRef,
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index fcb825b0..95f7dbb5 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -251,6 +251,20 @@
             </div>
             <div class="text">直播</div>
           </div>
+          <div>
+            <add-live
+              v-model:addliveVisible="addlivevisible"
+              :isLevel="true"
+              @changeData="updateTableData"
+              v-model:isactive="isactive"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:edit="edit"
+              v-model:EditLiveId="EditLiveId"
+             
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -260,6 +274,20 @@
             </div>
             <div class="text">外链</div>
           </div>
+          <div>
+            <add-ref
+              v-model:addrefVisible="addrefvisible"
+              :isLevel="true"
+              @changeData="updateTableData"
+              v-model:isactive="isactive"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:edit="edit"
+              v-model:EditRefId="EditRefId"
+             
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddDiscuss">
@@ -269,6 +297,20 @@
             </div>
             <div class="text">讨论</div>
           </div>
+          <div>
+            <add-discuss
+              v-model:adddiscussVisible="adddiscussvisible"
+              @changeData="updateTableData"
+              :isLevel="true"
+              v-model:isactive="isactive"
+              v-model:edit="edit"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:EditDiscussId="EditDiscussId"
+             
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddActive">
@@ -278,6 +320,19 @@
             </div>
             <div class="text">活动</div>
           </div>
+          <div>
+            <add-active
+              v-model:addactiveVisible="addactivevisible"
+              :isLevel="true"
+              v-model:edit="edit"
+              v-model:isactive="isactive"
+              @changeData="updateTableData"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:EditActiveId="EditActiveId"
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddEval">
@@ -290,10 +345,13 @@
             <div>
               <add-eval
                 v-model:addevalVisible="addevalvisible"
-                v-model:edit="edit"
-                v-model:learn="learn"
+                :isLevel="true"
+                @changeData="updateTableData"
                 v-model:isactive="isactive"
+                v-model:edit="edit"
                 v-model:routerId="routerId"
+                v-model:EditEvalId="EditEvalId"
+                v-model:routerTaskId="routerTaskId"
               />
             </div>
             <!-- 添加测评侧弹窗 -->
@@ -310,8 +368,14 @@
             <div>
               <add-invist
                 v-model:addinvistVisible="addinvistvisible"
+                :isLevel="true"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
                 v-model:edit="edit"
-                v-model:learn="learn"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditInvistId="EditInvistId"
+                v-model:routerTaskId="routerTaskId"
               />
             </div>
             <!-- 添加评估侧弹窗 -->
@@ -328,8 +392,14 @@
             <div>
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
+                :isLevel="true"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
                 v-model:edit="edit"
-                v-model:learn="learn"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditVoteId="EditVoteId"
+                v-model:routerTaskId="routerTaskId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -730,24 +800,8 @@
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
     <!-- 添加讨论侧弹窗 -->
-    <div>
-      <add-discuss
-        v-model:adddiscussVisible="adddiscussvisible"
-        v-model:isStudiscuss="isStudiscuss"
-        v-model:isactive="isactive"
-        v-model:routerId="routerId"
-      />
-    </div>
-    <!-- 添加讨论侧弹窗 -->
-    <!-- 添加活动侧弹窗 -->
-    <div>
-      <add-active
-        v-model:addactiveVisible="addactivevisible"
-        v-model:isStudiscuss="isStudiscuss"
-        v-model:isactive="isactive"
-        v-model:routerId="routerId"
-      />
-    </div>
+ 
+
     <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
     <a-modal
@@ -779,20 +833,7 @@
         </div>
       </div>
     </a-modal>
-    <!-- 添加直播抽屉 -->
-    <add-live
-      v-model:addliveVisible="addlivevisible"
-      v-model:isStudy="isStudy"
-      v-model:isactive="isactive"
-      v-model:routerId="routerId"
-    />
-    <!-- 添加外链抽屉 -->
-    <add-ref
-      v-model:addrefVisible="addrefvisible"
-      v-model:isStudy="isStudy"
-      v-model:isactive="isactive"
-      v-model:routerId="routerId"
-    />
+   
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -874,10 +915,7 @@ export default {
           name: "默认关卡",
         },
       ],
-      isRefEdit: 1, //外链编辑
-      isLiveEdit: 1, //直播编辑
-      EditRefId: null, //要编辑的外链的id
-      EditLiveId: null, //要编辑的直播的id
+  
       tableData: [
         {
           key: 1,
@@ -1078,15 +1116,21 @@ export default {
       editID: "", // 要编辑的任务id
       EditWorkId: "", // 要编辑的 workid
       EditTestId: "",
+      EditRefId:"",
+      EditLiveId:"",
+      EditDiscussId:"",
+      EditActiveId:"",
+      EditEvalId:"",
+      EditInvistId:"",
+      EditVoteId:"",
       routerTaskId: "",
+      chapterId:"",
       stageId: "",
-      isStudy: 1,
       cC: false,
       value1: "",
       value2: "",
       selectedRowKeys: [],
       edit: false, //是否点击编辑
-      learn: 0,
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
@@ -1103,14 +1147,7 @@ export default {
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
-    const showDrawerAddDiscuss = () => {
-      state.adddiscussvisible = true;
-      state.isStudiscuss = true;
-    };
-    const showDrawerAddActive = () => {
-      state.addactivevisible = true;
-      state.isStudiscuss = true;
-    };
+  
     //新建关卡
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
@@ -1161,6 +1198,7 @@ export default {
     };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
+      console.log("homework==============",id,state.isactive)
       state.addhomeworkvisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
@@ -1171,18 +1209,43 @@ export default {
       state.routerTaskId = eleId;
     };
     //测试评估投票抽屉
-    const showDrawerAddEval = () => {
-      state.addevalvisible = true;
-      state.learn = 1;
+    const showDrawerAddEval = (id, eleId) => {
+    
+      state.addhomeworkvisible = true;
+      state.EditEvalId = id;
+      state.routerTaskId = eleId;
     };
-    const showDrawerAddInvist = () => {
-      state.addinvistvisible = true;
-      state.learn = 1;
+    const showDrawerAddInvist = (id, eleId) => {
+      state.addhomeworkvisible = true;
+      state.EditInvistId = id;
+      state.routerTaskId = eleId;
     };
-    const showDrawerAddVote = () => {
-      state.addvotevisible = true;
-      state.learn = 1;
+    const showDrawerAddVote = (id, eleId) => {
+      state.addhomeworkvisible = true;
+      state.EditVoteId = id;
+      state.routerTaskId = eleId;
     };
+    const showDrawerAddLive = (id, eleId) => {
+      state.addlivevisible = true;
+      state.EditLiveId = id;
+      state.routerTaskId = eleId;
+    };
+    const showDrawerAddRef = (id, eleId) => {
+      state.addrefvisible = true;
+      state.EditRefId = id;
+      state.routerTaskId = eleId;
+    };
+    
+    const showDrawerAddDiscuss = (id, eleId) => {
+      state.adddiscussvisible = true;
+      state.EditDiscussId = id;
+      state.routerTaskId = eleId;
+    };
+    const showDrawerAddActive = (id, eleId) => {
+      state.addactivevisible = true;
+      state.EditActiveId = id;
+      state.routerTaskId = eleId;
+    };s
 
     // tableData数据赋值方法
     const dataAssignment = (id) => {
@@ -1246,128 +1309,7 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-    // const tableDataFunc = () => {
-    //   const columns = [
-    //     {
-    //       title: "类型",
-    //       dataIndex: "state",
-    //       // width: "30%",
-    //       key: "state",
-    //       width: 60,
-    //       align: "left",
-    //       className: "classify",
-    //       scopedSlots: { customRender: "action" }, //引入的插槽
-    //       customRender: (text) => {
-    //         // console.log(text.record.checked1);
-    //         return (
-    //           <div class="racona">
-    //             <div
-    //               class="img"
-    //               style={{ cursor: "pointer" }}
-    //               onClick={() => {
-    //                 console.log("点击了");
-    //               }}
-    //             ></div>
-    //             <span> {text.record.lei}</span>
-    //           </div>
-    //         );
-    //       },
-    //     },
-    //     {
-    //       title: "任务名称",
-    //       dataIndex: "creater",
-    //       // width: "30%",
-    //       key: "creater",
-    //       width: 200,
-    //       align: "center",
-    //       className: "h",
-    //     },
-    //     {
-    //       title: "必修/选修",
-    //       dataIndex: "pubtime",
-    //       key: "pubtime",
-    //       // width: 100,
-    //       align: "center",
-    //       className: "h",
-    //       scopedSlots: { customRender: "action" }, //引入的插槽
-    //       customRender: (text) => {
-    //         // console.log(text.record.checked1);
-    //         return (
-    //           <div class="opat">
-    //             <div class="opacationt clearfix">
-    //               <a-switch
-    //                 style="margin-left:-50px;margin-top:3px"
-    //                 checked={text.record.checked1}
-    //                 size="small"
-    //                 active-color="red"
-    //                 onClick={() => {
-    //                   console.log("点击了");
-    //                   text.record.checked1 = !text.record.checked1;
-    //                 }}
-    //               />
-    //               <div class="showt clearfix">
-    //                 <div
-    //                   class="bi"
-    //                   style={
-    //                     text.record.checked1 ? "z-index:999" : "z-index:998"
-    //                   }
-    //                 >
-    //                   必修
-    //                 </div>
-    //                 <div class="xuan">选修</div>
-    //               </div>
-    //             </div>
-    //           </div>
-    //         );
-    //       },
-    //     },
-    //     {
-    //       title: "时长",
-    //       dataIndex: "cretime",
-    //       key: "cretime",
-    //       // width: 100,
-    //       align: "center",
-    //       className: "h",
-    //     },
-    //     {
-    //       title: "操作",
-    //       className: "h",
-    //       dataIndex: "opacation",
-    //       key: "opacation",
-    //       // width: 100,
-    //       align: "center",
-    //       scopedSlots: { customRender: "action" }, //引入的插槽
-    //       customRender: (e) => {
-    //         return (
-    //           <div class="opa">
-    //             <div class="opacation">
-    //               <span
-    //                 style="color:#4EA6FF;margin-right:25px;cursor:pointer"
-    //                 onClick={() => {
-    //                   console.log("编辑id", e.record.routerTaskId);
-    //                   console.log("编辑类型", e.record.lei);
-    //                   state.editID = e.record.routerTaskId;
-    //                   //state.addhomeworkvisible = true;
-    //                 }}
-    //               >
-    //                 编辑
-    //               </span>
-    //               <span
-    //                 style="color:#4EA6FF;cursor:pointer"
-    //                 onClick={() => {
-    //                   showDeleteModal(e.record.routerTaskId);
-    //                 }}
-    //               >
-    //                 删除
-    //               </span>
-    //             </div>
-    //           </div>
-    //         );
-    //       },
-    //     },
-    //   ];
-    //   return columns;
-    // };
+   
     const checkType = (index) => {
       let typeRules = [
         "",
@@ -1610,13 +1552,7 @@ export default {
         });
     };
 
-    const showDrawerAddLive = () => {
-      state.addlivevisible = true;
-    };
-    const showDrawerAddRef = () => {
-      state.addrefvisible = true;
-    };
-
+   
     const closeDeleteModel = () => {
       state.deleteModal = false;
       state.deleteID = "";
@@ -1717,30 +1653,31 @@ export default {
           console.log("移动失败", err);
         });
     };
-    //打开编辑外链的弹窗
-    const showEditRefDrawer = (id) => {
-      state.addrefvisible = true;
-      state.isRefEdit = 2;
-      state.EditRefId = id;
-    };
-    //打开编辑直播的弹窗
-    const showEditLiveDrawer = (id) => {
-      state.addlivevisible = true;
-      state.isLiveEdit = 2;
-      state.EditLiveId = id;
-    };
+
+
     //编辑的按钮
     const decideType = (type, id, eleId) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id);
+        showDrawerAddRef(id, eleId);
       } else if (type == "直播") {
-        showEditLiveDrawer(id);
+        showDrawerAddLive(id, eleId);
       } else if (type == "作业") {
         showDrawerAddHomework(id, eleId);
       } else if (type == "考试") {
         showDrawerAddTest(id, eleId);
+      }else if (type == "讨论") {
+        showDrawerAddDiscuss(id, eleId);
+      }else if (type == "活动") {
+        showDrawerAddActive(id, eleId);
+      }else if (type == "测评") {
+        showDrawerAddInvist (id, eleId);
+      }else if (type == "评估") {
+        showDrawerAddEval (id, eleId);
+      }
+      else if (type == "投票") {
+        showDrawerAddVote(id, eleId);
       }
     };
     return {
@@ -1781,8 +1718,6 @@ export default {
       deletecTaskAll,
       moveTask,
       showDeleteModal,
-      showEditRefDrawer,
-      showEditLiveDrawer,
       decideType,
       updateTableData,
     };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index eeb9619d..5a906f75 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -190,7 +190,7 @@
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
-              v-model:isLiveEdit="isLiveEdit"
+              v-model:edit="edit"
               v-model:EditLiveId="EditLiveId"
               v-model:projectTaskId="projectTaskId"
             />
@@ -213,7 +213,7 @@
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
-              v-model:isRefEdit="isRefEdit"
+              v-model:edit="edit"
               v-model:EditRefId="EditRefId"
               v-model:projectTaskId="projectTaskId"
             />
@@ -1457,31 +1457,6 @@ export default {
           console.log("删除失败", err);
         });
     };
-    //编辑讨论
-    const editDiscuss = () => {
-      let obj = {
-        createTime: "",
-        createUser: 0,
-        discussExplain: "",
-        discussFlag: "",
-        discussId: 0,
-        discussName: "",
-        discussSettings: "",
-        discussTag: "",
-        projectId: 0,
-        updateTime: "",
-        updateUser: 0,
-      };
-      apidiscuss
-        .updateDiscuss(obj)
-        .then((res) => {
-          console.log("更新成功", res);
-          message.success("更新成功");
-        })
-        .catch((err) => {
-          console.log("更新失败", err);
-        });
-    };
     //删除活动
     const deleteActivity = () => {
       let obj = {
@@ -1500,38 +1475,7 @@ export default {
           console.log("删除失败", err);
         });
     };
-    //编辑活动
-    const editActivity = () => {
-      let obj = {
-        activityAddress: "",
-        activityDuration: "",
-        activityEndTime: "",
-        activityExplain: "",
-        activityFlag: "",
-        activityId: 0,
-        activityName: "",
-        activityNotice: "",
-        activityStartTime: "",
-        activityTag: "",
-        afterSignIn: "",
-        beforeSignIn: "",
-        createTime: "",
-        createUser: 0,
-        signOutTime: "",
-        standardSettings: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      apiactivity
-        .updateActivity(obj)
-        .then((res) => {
-          console.log("更新成功", res);
-          message.success("更新成功");
-        })
-        .catch((err) => {
-          console.log("更新失败", err);
-        });
-    };
+   
     //删除测评测试
     const deleteEvalText = () => {
       let obj = {
@@ -1570,39 +1514,6 @@ export default {
         });
     };
 
-    //编辑评估信息
-    const editInvistPath = () => {
-      let obj = {
-        appraiseEndTime: "",
-        appraiseExplain: "",
-        appraiseFlag: "",
-        appraiseId: 0,
-        appraiseName: "",
-        appraiseStartTime: "",
-        appraiseTag: "",
-        createTime: "",
-        createUser: 0,
-        researchId: 0,
-        researchName: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      apiinvist
-        .updateAppraiseMessage(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("修改失败", err);
-          // state.createLoading = false;
-          //重新获取列表
-          getTask();
-        });
-    };
-
     //删除任务
     const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
@@ -1635,39 +1546,7 @@ export default {
         });
     };
 
-    //编辑投票信息
-    const editVotePath = () => {
-      let obj = {
-        baseVote: "",
-        createTime: "",
-        createUser: 0,
-        stem: "",
-        stemId: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: "",
-        voteExplain: "",
-        voteFlag: "",
-        voteId: 0,
-        voteName: "",
-        voteStartTime: "",
-        voteTag: "",
-      };
-      apivote
-        .editVote(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("修改失败", err);
-          // state.createLoading = false;
-          //重新获取列表
-          getTask();
-        });
-    };
+    
     const showChangeModal = () => {
       state.visiblene = true;
     };
@@ -1777,23 +1656,22 @@ export default {
       state.projectTaskId = eleId;
       state.addtestvisible = true;
     };
-    const showDrawerAddLive = () => {
+    const showDrawerAddLive = (id, eleId) => {
       state.addlivevisible = true;
+      state.EditLiveId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerAddRef = (id, eleId) => {
       state.EditRefId = id;
       state.projectTaskId = eleId;
       state.addrefvisible = true;
     };
-    const showDrawerAddDiscuss = () => {
-      state.adddiscussvisible = true;
-    };
-    //打开编辑讨论的弹窗
-    const showEditAddDiscuss = (id, eleId) => {
+    const showDrawerAddDiscuss = (id, eleId) => {
       state.editDiscussId = id;
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     };
+   
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.editActivityId = id;
@@ -1892,19 +1770,8 @@ export default {
     const changeCourseType = (id) => {
       console.log("任务id", id);
     };
-    //打开编辑外链的弹窗
-    const showEditRefDrawer = (id, eleId) => {
-      state.addrefvisible = true;
-      state.isRefEdit = true;
-      state.EditRefId = id;
-      state.projectTaskId = eleId;
-    };
-    //打开编辑直播的弹窗
-    const showEditLiveDrawer = (id) => {
-      state.addlivevisible = true;
-      state.isLiveEdit = 2;
-      state.EditLiveId = id;
-    };
+ 
+ 
     //打开测评的弹窗
     const showEditEvalDrawer = (id, eleId) => {
       console.log("222222222222222222222", id);
@@ -1918,9 +1785,9 @@ export default {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id, eleId);
+        showDrawerAddRef(id, eleId);
       } else if (type == "直播") {
-        showEditLiveDrawer(id, eleId);
+        showDrawerAddLive(id, eleId);
       } else if (type == "测评") {
         showEditEvalDrawer(id, eleId);
       } else if (type == "评估") {
@@ -1928,7 +1795,7 @@ export default {
       } else if (type == "投票") {
         showDrawerAddVote(id, eleId);
       } else if (type == "讨论") {
-        showEditAddDiscuss(id, eleId);
+        showDrawerAddDiscuss(id, eleId);
       } else if (type == "活动") {
         showDrawerAddActive(id, eleId);
       } else if (type == "作业") {
@@ -1974,15 +1841,12 @@ export default {
       getTask,
       deleteLiveBroadcast,
       deleteDiscuss,
-      editDiscuss,
+     
       deleteEvalText,
       deleteExternalChain,
       deleteActivity,
       deleteVoteText,
-      editActivity,
       deleteInvistText,
-      editInvistPath,
-      editVotePath,
       getTableData,
       deleteTask,
       editStage,
@@ -1997,8 +1861,8 @@ export default {
       deleteTest,
       deleteWork,
       decideType,
-      showEditRefDrawer,
-      showEditLiveDrawer,
+      
+      
     };
   },
 };

From ee03a13e6e773182bb282902c940624065ce8991 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 11 Nov 2022 01:22:29 +0800
Subject: [PATCH 22/90] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue      |  17 ++--
 src/components/drawers/AddDiscuss.vue     |  37 +++++---
 src/components/drawers/AddLive.vue        | 105 ++++++++++++++++------
 src/components/drawers/AddRef.vue         |   9 +-
 src/views/learningpath/LevelAddDetail.vue |   2 +-
 src/views/projectcenter/TaskAdd.vue       |  26 ++----
 6 files changed, 131 insertions(+), 65 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index a5de57fd..fb0719f1 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -323,12 +323,12 @@ export default {
       state.textV2 = "";
       state.time = "";
       message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-      ctx.emit("changeData", false);
+    
     };
     const queryActive = () => {
       console.log("props.EditActiveId======",props.EditActiveId,props.chooseStageId,props.routerTaskId);
         api.getActivity(props.EditActiveId).then(res => {
-          console.log('获取讨论信息成功',res.data.data)
+          console.log('获取讨论信息成功',res.data.data.standardSettings)
           
           //更新讨论信息
           state.inputV1 =  res.data.data.activityName;
@@ -337,8 +337,10 @@ export default {
           state.inputV2 = res.data.data.activityDuration;
           state.inputV3 = res.data.data.activityAddress;
           state.inputV5 = res.data.data.afterSignIn;
+          state.inputV6 =res.data.data.signOutTime;
           state.inputV4 = res.data.data.beforeSignIn;
-          state.radioV1 = res.data.data.standardSettings;
+          state.radioV1 = Number(res.data.data.standardSettings);
+          
           state.time = [dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD")]
         }).catch(err=>{
           console.log('获取讨论信息失败',err)
@@ -363,11 +365,11 @@ export default {
             duration: res.data.data.activityDuration,
             name: res.data.data.activityName,
             routerId: props.routerId,
-            routerTaskId: props.routerTaskId,
+            routerTaskId: props.routerTaskId ||0,
             type: 9,
           }).then(res => {
             console.log("新增关卡任务成功",res);
-            
+           
           }).catch(err => {
             console.log("新增关卡任务失败",err);
           })
@@ -377,11 +379,12 @@ export default {
             duration: res.data.data.activityDuration,
             name: res.data.data.activityName,
             projectId: props.projectId,
-            projectTaskId: props.projectTaskId,
+            projectTaskId: props.projectTaskId ||0,
             stageId:props.chooseStageId,
             type: 9,
           }).then((res)=> {
             console.log("更新任务列表成功",res);
+           
           })
           .catch((err)=> {
             console.log("更新任务列表失败",err);
@@ -434,6 +437,7 @@ export default {
         .then((res) => {
           closeDrawer();
           updateTask(res);
+          ctx.emit("changeData", false);
       })
       .catch((err) => {
         console.log("更新失败",err);
@@ -446,6 +450,7 @@ export default {
             message.success("创建成功");
             closeDrawer();
             updateTask(res);
+            ctx.emit("changeData", false);
         })
         .catch((err) => {
           console.log("创建失败",err);
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 7e29da4d..b2166686 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -56,7 +56,7 @@
               <span style="margin-right: 3px">讨论设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1" @onclick = "checkedC1=!checkedC1">允许评论</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @change = "checkRadio">允许评论</a-checkbox>
             </div>
           </div>
         </div>
@@ -148,15 +148,24 @@ export default {
       inputV2: "",
       textV1: "",
       checkedC1: false,
+      discussSettings:"",
       addLoading:false,
     });
+    const checkRadio = () =>{
+      if(state.checkedC1){
+        state.discussSettings = "true"
+      }else{
+        state.discussSettings = "false";
+      }
+      console.log("state.checkedC1=====",state.discussSettings,state.discussSettings=="true");
+    }
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
       ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.textV1 = "";
       message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-      ctx.emit("changeData", false);
+   
     };
     const queryDiscuss = () =>{
       if(props.edit){
@@ -166,8 +175,8 @@ export default {
           //更新讨论信息
           state.inputV1 = res.data.data.discussName;
           state.textV1 = res.data.data.discussExplain;
-          state.checkedC1 = Boolean(res.data.data.discussSettings);
-          console.log("props.EditDiscussId",res.data.data.discussSettings,state.checkedC1==Boolean(res.data.data.discussSettings),Boolean(res.data.data.discussSettings),state.checkedC1)
+          state.checkedC1 = res.data.data.discussSettings=="true"?true:false;
+          console.log("props.EditDiscussId",res.data.data.discussSettings,"===",res.data.data.discussSettings=="true",state.checkedC1)
         }).catch(err=>{
           console.log('获取讨论信息失败',err)
         })
@@ -187,23 +196,21 @@ export default {
             courseId: res.data.data.discussId,
             name: res.data.data.discussName,
             routerId: props.routerId,
-            routerTaskId: props.routerTaskId,
+            routerTaskId: props.routerTaskId ||0,
             type: 8,
-          }).then(res => {
-              closeDrawer();
+          }).then(res => { 
               console.log("新增关卡任务失败",res);
           }).catch(err => {console.log("新增关卡任务失败",err);})
         }else{
         apiTask
-        .updateTask({
+        .addTask({
           courseId: res.data.data.discussId,
           name: res.data.data.discussName,
           projectId: props.projectId,
-          projectTaskId: props.projectTaskId,
-          stageId: props.stageId,
+          projectTaskId: props.projectTaskId || 0,
+          stageId:props.chooseStageId,
           type: 8,       
         }).then(r=>{
-          closeDrawer();
           console.log("新增关卡任务成功",r);
         }).catch(r=>{
           console.log('更新阶段任务失败',r)
@@ -218,7 +225,7 @@ export default {
       let obj = {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明
-        discussSettings: String(state.checkedC1), //讨论设置
+        discussSettings: state.discussSettings, //讨论设置
         discussId: props.edit?props.EditDiscussId:0,//讨论Id
         projectId: 0, //项目id,接口多余字段，
       };
@@ -228,6 +235,8 @@ export default {
           .updateDiscuss(obj)
           .then((res)=> {
             updateTask(res);
+            closeDrawer();
+            ctx.emit("changeData", false);
             console.log("更新成功",res);
             console.log("项目任务ID",props.projectTaskId)
           })
@@ -239,6 +248,8 @@ export default {
         .createDiscuss(obj)
         .then((res)=> {
           updateTask(res);
+          closeDrawer();
+          ctx.emit("changeData", false);
           console.log("创建成功",res);
           console.log("项目任务ID",props.projectTaskId)
         })
@@ -253,7 +264,7 @@ export default {
       closeDrawer,
       rowSelection,
       updateDiscussInfo,
-      
+      checkRadio,
     };
   },
 };
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index a8f7efb8..f96da6b0 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -32,7 +32,7 @@
             <div class="btnbox">
               <a-input
                 v-model:value="inputV1"
-                style="width: 424px; height: 32px"
+                style="width: 400px; height: 32px"
                 placeholder="请输入考试名称"
                 maxlength="20"
               />
@@ -47,7 +47,7 @@
                 v-model:value="textV1"
                 placeholder="请输入考试说明"
                 allow-clear
-                maxlength="150"
+                maxlength="364px"
               />
             </div>
           </div>
@@ -84,7 +84,7 @@
                     :min="0"
                     :max="300"
                     :precision="0"
-                    style=" width: 388px; height: 32px; border-radius: 8px;overflow: hidden; "
+                    style=" width: 364px; height: 32px; border-radius: 8px;overflow: hidden; "
                     v-model:value="inputV2"
                   ></a-input-number>
             
@@ -102,11 +102,19 @@
               <span style="margin-right: 3px">授课老师：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                v-model:value="inputV3"
-                style="width: 424px; height: 32px"
-                placeholder="请输入授课老师"
-              />
+               
+                <a-select
+                  v-model:value="value"
+                  show-search
+                  placeholder="Select a teacher"
+                  style="width: 364px"
+                  :options="options"
+                  :filter-option="filterOption"
+                  @focus="handleFocus"
+                  @blur="handleBlur"
+                  @change="handleChange2"
+                ></a-select>
+               
             </div>
           </div>
           <div class="main_item2">
@@ -177,20 +185,23 @@
               <span style="margin-right: 3px">评价：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1" @onclick = 'checkedC1=!checkedC1'>需要评估</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @change = "checkRadio">需要评估</a-checkbox>
             </div>
           </div>
-          <div class="main_item" style="margin-top: -25px">
+          <div class="main_item" style="margin-top: -25px," :style="{ display: checkedC1 ? 'block' : 'none' }">
             <div class="signbox"></div>
             <div class="btnbox">
               <a-select
-                dropdownClassName="dropdown-style"
-                style="width: 424px"
-                placeholder="选择评估"
-                :options="options1"
-                allowClear
-                showSearch
-              />
+                  v-model:value="value"
+                  show-search
+                  placeholder="选择评估"
+                  style="width: 364px"
+                  :options="options"
+                  :filter-option="filterOption"
+                  @focus="handleFocus"
+                  @blur="handleBlur"
+                  @change="handleChange2"
+                ></a-select>
             </div>
           </div>
           <div class="main_item2">
@@ -298,6 +309,7 @@ const options1 = ref([
   },
 ]);
 
+
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -528,9 +540,7 @@ export default {
         message.error(`查询失败`)
       })
     };
-    const PlayBack = () => {
-      state.playback = !state.playback;
-    };
+
     const cloradio1 = (value) => {
       console.log(value.target._value); //点击的选项
       if (state.radioV1 === value.target._value) {
@@ -635,9 +645,17 @@ export default {
       if (!regular.test(state.inputV2)) {
         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 (!state.inputV3) 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(
@@ -663,9 +681,8 @@ export default {
         liveId: props.edit?props.EditLiveId:0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
-        livePlayback: "",
-        livePlaybackLink: state.inputV5,
-        liveTag: "",
+        livePlayback:state.playback ? "true":"false",
+        livePlaybackLink: state.playback?state.inputV5:"",
         liveTeacherId: state.inputV3,
         otherSettings:0, //1或0
         signOutTime: state.inputV8,
@@ -702,12 +719,40 @@ export default {
     
     };
 
-
+    const options = ref([{
+      value: 'jack',
+      label: 'Jack',
+    }, {
+      value: 'lucy',
+      label: 'Lucy',
+    }, {
+      value: 'tom',
+      label: 'Tom',
+    }]);
+    const handleChange2 = value => {
+      console.log(`selected ${value}`);
+    };
+    const handleBlur = () => {
+      console.log('blur');
+    };
+    const handleFocus = () => {
+      console.log('focus');
+    };
+    const checkRadio = () =>{
+      if(state.checkedC1){
+        state.discussSettings = "true"
+      }else{
+        state.discussSettings = "false";
+      }
+      console.log("state.checkedC1=====",state.discussSettings,state.discussSettings=="true");
+    }
+    const filterOption = (input, option) => {
+      return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      PlayBack,
       options1,
       // columns1,
       rowSelection,
@@ -715,6 +760,12 @@ export default {
       handleChange,
       beforeUpload,
       updateLiveBroadcast,
+      filterOption,
+      handleBlur,
+      handleFocus,
+      handleChange2,
+      options,
+      checkRadio,
     };
   },
 };
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index e7b28d2e..687243a8 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -229,7 +229,14 @@ export default {
     //创建外链
     const updateRef = () => {
       if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2) return message.warning("请输入链接");
+      if (!state.inputV2){
+        return message.warning("请输入链接");
+      }else{
+        const reg = /(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
+        if ((!reg.test(state.inputV2)) && state.inputV2 != '') {
+          return message.warning("请输入合法的链接地址");
+        } 
+      } 
       let obj = {   
         linkAddress: state.inputV2,
         linkDescription: state.textV1,
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 005269cb..5da3bc3b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1276,7 +1276,7 @@ export default {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.routerTaskId = eleId;
-    };s
+    };
 
     // tableData数据赋值方法
     const dataAssignment = (id) => {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 81f44399..360f5a35 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -235,7 +235,7 @@
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
-              v-model:editDiscussId="editDiscussId"
+              v-model:EditDiscussId="EditDiscussId"
               v-model:projectTaskId="projectTaskId"
               @changeData="updateTableData"
             />
@@ -255,7 +255,7 @@
             <add-active
               v-model:addactiveVisible="addactivevisible"
               v-model:projectId="projectId"
-              v-model:editActivityId="editActivityId"
+              v-model:EditActiveId="EditActiveId"
               v-model:projectTaskId="projectTaskId"
               v-model:edit="edit"
               v-model:chooseStageId="chooseStageId"
@@ -922,9 +922,9 @@ export default {
       isRefEdit: false, //外链编辑
       isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
-      EditLiveId: null, //要编辑的直播的id
-      editDiscussId:null,//要编辑的讨论的id
-      editActivityId:null,//要编辑的活动id
+      EditLiveId: null, //要编辑的直播的ids
+      EditDiscussId:null,//要编辑的讨论的id
+      EditActiveId:null,//要编辑的活动id
       EditWorkId:null, // 要编辑的作业id
       EditTestId: null,// 要编辑的考试id
       EditEvalId:null,
@@ -1326,16 +1326,7 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-              //后加选择了阶段id
-              // if(state.chooseStageId!==null){
-              //   let final = res.data.data.stageList.find((item)=>item.id==state.chooseStageId)
-              //   getTableData(final)
-              // }else{
-              //   //获取任务列表
-              // let arr = res.data.data.stageList[0].taskList;
-              // console.log("任务列表", arr);
-              // getTableData(arr);
-              // }
+     
               let arr = res.data.data.stageList[0].taskList;
               console.log("任务列表", arr);
               getTableData(arr);
@@ -1676,15 +1667,16 @@ export default {
       state.addrefvisible = true;
     };
     const showDrawerAddDiscuss = (id, eleId) => {
-      state.editDiscussId = id;
+      state.EditDiscussId = id;
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     };
    
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
-      state.editActivityId = id;
+      state.EditActiveId = id;
       state.projectTaskId = eleId;
+      console.log("active=======",id);
     };
     const showDrawerAddEval = () => {
       state.addevalvisible = true;

From c3b09e61c7b7cecbb9bec0e55ce00839886eb10c Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Fri, 11 Nov 2022 09:22:25 +0800
Subject: [PATCH 23/90] =?UTF-8?q?feat:=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B7=B3=E8=BD=AC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CreVote.vue   |   6 +-
 src/components/windows/DelWins.vue   | 161 ---------------------------
 src/views/projectcenter/TaskPage.vue |  70 ++++++++----
 3 files changed, 50 insertions(+), 187 deletions(-)
 delete mode 100644 src/components/windows/DelWins.vue

diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index cdcd309d..56cf411d 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -38,7 +38,7 @@
         <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 class="btnText" @click="DelShow()">删除题干</div>
           </div>
           <div class="main_item">
             <div class="signbox">
@@ -109,8 +109,6 @@ import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
 export default {
   name: "CreVote",
-  // components: {
-  // },
   props: {
     crevoteVisible: {
       type: Boolean,
@@ -138,7 +136,6 @@ export default {
         },
       ],
     });
-
     const addQue = () => {
       state.questions.push({
         stemTit: "题干",
@@ -168,7 +165,6 @@ export default {
       // delete value[0]
       value.pop()
     }
-
     const closeDrawer = () => {
       ctx.emit("update:crevoteVisible", false);
     };
diff --git a/src/components/windows/DelWins.vue b/src/components/windows/DelWins.vue
deleted file mode 100644
index de5ca5c2..00000000
--- a/src/components/windows/DelWins.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-    <!--删除弹窗 -->
-    <a-modal
-      v-model:visible="delete_hs"
-      :footer="null"
-      :closable="closableQR"
-      wrapClassName="DelModal"
-      style="margin-top: 400px"
-    >
-      <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="del-icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="delete_exit"></div>
-          </div>
-          <div class="body">
-            <span>您确定要删除此课程吗</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
-            </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!--删除弹窗 -->
-</template>
-
-<script>
-import { toRefs, reactive, defineComponent } from "vue";
-export default defineComponent({
-    name: "DelWins",
-      props: {
-        delete_hs: {
-        type: Boolean,
-        default: false,
-    },
-  },
-    setup() {
-        const state = reactive({
-            delete_hs: false,
-            closableQR: false,
-        })
-        const delete_exit = () => {
-            state.delete_hs = false;
-        }
-        return {
-            ...toRefs(state),
-            delete_exit,
-        };
-    },
-})
-</script>
-<style lang="scss" scope>
-.DelModal {
-  .ant-modal {
-    .ant-modal-content {
-      width: 424px !important;
-      .ant-modal-body {
-        .delete {
-          z-index: 999;
-          width: 424px;
-          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: 40px;
-            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;
-              .del-icon {
-                width: 16px;
-                height: 16px;
-                margin-right: 10px;
-                background-image: url(@/assets/images/coursewareManage/notice.png);
-                background-size: 100% 100%;
-              }
-              .icon {
-                width: 16px;
-                height: 16px;
-                margin-right: 10px;
-                background-image: url(@/assets/images/coursewareManage/QR.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;
-            }
-            .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;
-                margin-right: 14px;
-                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;
-              }
-              .btn2 {
-                background-color: #4ea6ff;
-                color: #ffffff;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index dbd5e4b6..75e3e4c5 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -220,14 +220,16 @@
             <div class="split"></div>
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <button class="btn" @click="showFaceIn">批量面授报名</button>
-              <button to="/taskadd" class="edit">
-                <img
-                  class="editimg"
-                  src="../../assets/images/projectadd/edit.png"
-                />
-                <span class="editext">编辑</span>
-              </button>
+              <button class="btn" @click="showFaceIn" v-if="morFaceT">批量面授报名</button>
+              <router-link to="/taskadd">
+                <button to="/taskadd" class="edit">
+                  <img
+                    class="editimg"
+                    src="../../assets/images/projectadd/edit.png"
+                  />
+                  <span class="editext">编辑</span>
+                </button>
+              </router-link>
             </div>
             <!-- <div class="taskSyllabus">
             <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
@@ -429,6 +431,7 @@
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
                   display: block;
                 "
+                v-if="taskSyllabus.length == 0"
               >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left2.png" />
@@ -968,7 +971,7 @@
                 <div class="setc_name"><span>封面图：</span></div>
                 <div class="setc_main">
                   <img
-                    style="width: 151px; height: 84px;"
+                    style="width: 151px; height: 84px"
                     :src="picUrl"
                     alt=""
                   />
@@ -1036,9 +1039,16 @@
       </a-tabs>
     </div>
     <!-- 时间管理抽屉 -->
-    <time-manage v-model:Tvisible="visible" :title="showTimeText" v-model:ProjectTaskId="projectTaskId"/>
+    <time-manage
+      v-model:Tvisible="visible"
+      :title="showTimeText"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 面授管理抽屉 -->
-    <face-manage v-model:Fvisible="FaceVisivle" v-model:ProjectTaskId="projectTaskId"/>
+    <face-manage
+      v-model:Fvisible="FaceVisivle"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
     <!-- 学员管理-添加学员抽屉 -->
@@ -1056,9 +1066,16 @@
     <!-- 活动考勤抽屉 -->
     <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
-    <work-manage v-model:Wvisible="Wvisible" v-model:ProjectTaskId="projectTaskId"/>
+    <work-manage
+      v-model:Wvisible="Wvisible"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 考试管理抽屉 -->
-    <test-manage v-model:TMvisible="TMvisible" :title="showTestText" v-model:ProjectTaskId="projectTaskId"/>
+    <test-manage
+      v-model:TMvisible="TMvisible"
+      :title="showTestText"
+      v-model:ProjectTaskId="projectTaskId"
+    />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
@@ -1812,7 +1829,7 @@ export default {
       selectedRowKeys: [], //选择的学员
       selectedRows: [], //选择的学员的id值
       chooseDeleteOne: [], //删除的单个学员id
-      projectTaskId:"", //项目任务id
+      projectTaskId: "", //项目任务id
       //进度排行学员
       rankjindu: [{ value: "学员", label: "学员" }],
       valuestu1: "学员",
@@ -1874,7 +1891,7 @@ export default {
       noticeChecked: true,
       noticeContent: "",
       TaskFaceImpStuvisible: false, //批量面授报名
-
+      morFaceT:true, //批量面授报名按钮
       //进度排行表
       jindutabledata: [
         {
@@ -2342,7 +2359,6 @@ export default {
       level: null, //项目级别
       systemId: null, //培训体系
       picUrl: null,
-
     });
 
     // 输入接入 -- start --
@@ -2363,15 +2379,20 @@ export default {
           if (res.status == 200) {
             console.log("res", res);
             console.log("阶段列表", res.data.data.stageList);
-            console.log('任务id',res.data.data.stageList[0].taskList[0].projectTaskId)
-            //taskList[num] num应该是点那个就是那个数 
-            state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId 
+            console.log(
+              "任务id",
+              res.data.data.stageList[0].taskList[0].projectTaskId
+            );
+            //taskList[num] num应该是点那个就是那个数
+            state.projectTaskId =
+              res.data.data.stageList[0].taskList[0].projectTaskId;
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               //获取任务列表 阶段
               let taskarr = res.data.data.stageList;
               state.taskSyllabus = taskarr;
-              // console.log(res.data.data.stageList[0].taskList[0].type, "ggg");
+              console.log("123456789", state.taskSyllabus);
+              // console.log(res.data.data.stageList[0].taskList[0].name, "ggg");
             }
           }
         })
@@ -3046,7 +3067,14 @@ export default {
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
         state.checkedBOEU = info.boeFlag == 1 ? true : false;
         state.picUrl = info.picUrl;
-        state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-"
+        state.sourceBelong =
+          info.sourceBelongId == 1
+            ? "项目一"
+            : info.sourceBelongId == 2
+            ? "项目二"
+            : info.sourceBelongId == 3
+            ? "项目三"
+            : "-";
       });
     });
     return {

From b5f3c234c95ab2259e9e2b6157a8604ab03503b6 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Fri, 11 Nov 2022 14:36:54 +0800
Subject: [PATCH 24/90] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E6=89=B9=E9=87=8F=E5=85=8D=E5=8F=97=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=20=E6=93=8D=E4=BD=9C=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=97=E8=A1=A8=E6=B8=B2=E6=9F=93=E5=92=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E9=87=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CreVote.vue    |   2 +-
 src/components/drawers/FaceManage.vue | 175 +++++++++----------
 src/components/drawers/TestManage.vue | 215 ++++++++++-------------
 src/components/drawers/TimeManage.vue | 206 +++++++++++-----------
 src/components/drawers/WorkManage.vue | 235 +++++++++++---------------
 src/views/projectcenter/TaskPage.vue  |  78 ++++-----
 6 files changed, 413 insertions(+), 498 deletions(-)

diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 56cf411d..29c1fe21 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -38,7 +38,7 @@
         <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" @click="DelShow()">删除题干</div>
+            <div class="btnText">删除题干</div>
           </div>
           <div class="main_item">
             <div class="signbox">
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index cdb61889..d159102b 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -41,11 +41,15 @@
             </div>
           </div>
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px">
+            <div
+              class="btn btn1"
+              style="margin-right: 20px"
+              @click="searchTaskList"
+            >
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="searchTaskList">
               <div class="img2"></div>
               <div class="wz">重置</div>
             </div>
@@ -158,7 +162,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    ProjectTaskId: {
+    projectTaskId: {
       type: Number,
       default: null,
     },
@@ -176,6 +180,7 @@ export default {
       showdonemodal: false,
       open: false,
       selectedRowKeys: [],
+      projectName: "",
       projectNameList: [
         {
           id: 1,
@@ -199,108 +204,36 @@ export default {
         },
       ],
       tabledata: [
-        {
-          key: 1,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "-",
-          state: "未完成",
-        },
-        {
-          key: 2,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "-",
-          state: "未完成",
-        },
-        {
-          key: 3,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "合格",
-          state: "完成",
-        },
-        {
-          key: 4,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "合格",
-          state: "完成",
-        },
-        {
-          key: 5,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "合格",
-          state: "完成",
-        },
-        {
-          key: 6,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "合格",
-          state: "完成",
-        },
-        {
-          key: 7,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "合格",
-          state: "完成",
-        },
-        {
-          key: 8,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "不合格",
-          state: "完成",
-        },
-        {
-          key: 9,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "不合格",
-          state: "完成",
-        },
-        {
-          key: 10,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          score: "不合格",
-          state: "完成",
-        },
+        // {
+        //   key: 1,
+        //   name: "哈哈",
+        //   bum: "产品部",
+        //   gangw: "产品经理",
+        //   score: "-",
+        //   state: "未完成",
+        // },
       ],
       tablecolumns: [
         {
           title: "姓名",
-          dataIndex: "name",
-          key: "name",
+          dataIndex: "userName",
+          key: "userName",
           width: 50,
           align: "left",
           className: "h head",
         },
         {
           title: "所在部门",
-          dataIndex: "bum",
-          key: "bum",
+          dataIndex: "deptName",
+          key: "userName",
           width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "所在岗位",
-          dataIndex: "gangw",
-          key: "gangw",
+          dataIndex: "jobName",
+          key: "jobName",
           width: 60,
           align: "center",
           className: "h",
@@ -315,8 +248,8 @@ export default {
         },
         {
           title: "任务状态",
-          dataIndex: "state",
-          key: "state",
+          dataIndex: "status",
+          key: "status",
           width: 60,
           align: "center",
           className: "h",
@@ -325,6 +258,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
+      state.projectName = value
     };
     const closeDrawer = () => {
       ctx.emit("update:Fvisible", false);
@@ -371,26 +305,67 @@ export default {
         name: "",
         pageNo: 0,
         pageSize: 0,
-        projectTaskId: props.ProjectTaskId,
+        projectTaskId: props.projectTaskId,
         status: 0,
       };
-      console.log('9999999999999',obj.projectTaskId);
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log('获取任务管理列表成功', res);
-          
+          console.log("获取面授任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          // for (let i = 0; i < res.data.data.rows.length; i++) {
+          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          // }
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i]);
+            //需要确认值 赋给tablecolumns
+            console.log('state.tabledata',state.tabledata);
+          }
         })
         .catch((err) => {
-        console.log("获取任务列表失败",err)
-      })
+          console.log("获取面授任务列表失败", err);
+        });
     };
 
+
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: state.name,
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: state.projectName,
+      };
+      api
+        .taskStudentList(objser)
+        .then((res) => {
+          console.log("获取任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          }
+        })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
+    };
+
+    //重置任务列表
+    const resetTaskList = () => {
+      state.name = "",
+      state.projectName="";
+      getManageList();
+    };
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList()
-      },1000)
+        getManageList();
+      }, 1000);
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
@@ -411,6 +386,8 @@ export default {
       closedoneModal,
       showopen,
       getManageList,
+      searchTaskList,
+      resetTaskList,
     };
   },
 };
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 072f1b21..f8619fbd 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ title }}</div>
+        <div class="headerTitle">【{{ title }}】管理</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -43,11 +43,11 @@
             </div>
           </div>
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px">
+            <div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="resetTaskList">
               <div class="img2"></div>
               <div class="wz">重置</div>
             </div>
@@ -108,6 +108,7 @@
 
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import * as api from "../../api/index";
 export default {
   name: "TestManage",
   props: {
@@ -132,6 +133,7 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
+      projectName:'',
       projectNameList: [
         {
           id: 1,
@@ -165,151 +167,45 @@ export default {
           time: "-",
           state: "未完成",
         },
-        {
-          key: 2,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "1",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 3,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 4,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 5,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 6,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 7,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 8,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 9,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 10,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "10",
-          score: "10",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
       ],
       tablecolumns: [
         {
           title: "姓名",
-          dataIndex: "name",
-          key: "name",
+          dataIndex: "userName",
+          key: "userName",
           width: 50,
-          align: "center",
-          className: "h",
+          align: "left",
+          className: "h head",
         },
         {
           title: "所在部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 50,
+          dataIndex: "deptName",
+          key: "userName",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "所在岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 50,
+          dataIndex: "jobName",
+          key: "jobName",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
-          title: "考试次数",
-          dataIndex: "comp",
-          key: "comp",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "成绩",
+          title: "课程成绩",
           dataIndex: "score",
           key: "score",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "完成时间",
-          dataIndex: "time",
-          key: "time",
-          width: 100,
+          width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "任务状态",
-          dataIndex: "state",
-          key: "state",
-          width: 50,
+          dataIndex: "status",
+          key: "status",
+          width: 60,
           align: "center",
           className: "h",
         },
@@ -317,6 +213,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
+      state.projectName = value
     };
     const closeDrawer = () => {
       ctx.emit("update:TMvisible", false);
@@ -327,8 +224,75 @@ export default {
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
+
+    //获取任务管理列表
+    const getManageList = () => {
+      let obj = {
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: 0,
+      };
+      api
+        .taskStudentList(obj)
+        .then((res) => {
+          console.log("获取测试任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          // for (let i = 0; i < res.data.data.rows.length; i++) {
+          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          // }
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i]);
+            //需要确认值 赋给tablecolumns
+            console.log('state.tabledata',state.tabledata);
+          }
+        })
+        .catch((err) => {
+          console.log("获取测试任务列表失败", err);
+        });
+    };
+
+
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: state.name,
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: state.projectName,
+      };
+      api
+        .taskStudentList(objser)
+        .then((res) => {
+          console.log("获取任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          }
+        })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
+    };
+
+    //重置任务列表
+    const resetTaskList = () => {
+      state.name = "",
+      state.projectName="";
+      getManageList();
+    };
+
     let timer;
     onMounted(() => {
+      setTimeout(() => {
+        getManageList();
+      }, 1000);
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
@@ -344,6 +308,9 @@ export default {
       onMounted,
       onUnmounted,
       onChange,
+      getManageList,
+      searchTaskList,
+      resetTaskList,
     };
   },
 };
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index b1661cda..123bbb57 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ title }}</div>
+        <div class="headerTitle">【{{ title }}】管理</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -43,11 +43,15 @@
             </div>
           </div>
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px">
+            <div
+              class="btn btn1"
+              style="margin-right: 20px"
+              @click="searchTaskList"
+            >
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="resetTaskList">
               <div class="img2"></div>
               <div class="wz">重置</div>
             </div>
@@ -104,6 +108,7 @@
 
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import * as api from "../../api/index";
 export default {
   name: "TimeManage",
   props: {
@@ -128,6 +133,7 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
+      projectName:'',
       projectNameList: [
         {
           id: 1,
@@ -153,123 +159,64 @@ export default {
       tabledata: [
         {
           key: 1,
-          name: "哈哈",
-          bum: "产品部",
+          userName: "哈哈",
+          deptName: "产品部",
           gangw: "产品经理",
           time: "-",
           state: "未完成",
         },
-        {
-          key: 2,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 3,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 4,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 5,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 6,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 7,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 8,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 9,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 10,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
+        // {
+        //   endStudyTime: 0,
+        //   name: "",
+        //   projectTaskId: 0,
+        //   status: 0,
+        //   studentId: 0,
+        //   userInfoBo: {
+        //     deptName: "1",
+        //     jobName: "2",
+        //     userId: 0,
+        //     userName: "3"
+        //   }
+        // }
       ],
       tablecolumns: [
         {
           title: "姓名",
-          dataIndex: "name",
-          key: "name",
+          dataIndex: "userName",
+          key: "userName",
           width: 50,
-          align: "center",
-          className: "h",
+          align: "left",
+          className: "h head",
         },
         {
           title: "所在部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 50,
+          dataIndex: "deptName",
+          key: "userName",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "所在岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 50,
+          dataIndex: "jobName",
+          key: "jobName",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
-          title: "完成时间",
-          dataIndex: "time",
-          key: "time",
-          width: 50,
+          title: "课程成绩",
+          dataIndex: "score",
+          key: "score",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "任务状态",
-          dataIndex: "state",
-          key: "state",
-          width: 50,
+          dataIndex: "status",
+          key: "status",
+          width: 60,
           align: "center",
           className: "h",
         },
@@ -277,6 +224,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
+      state.projectName = value
     };
     const closeDrawer = () => {
       ctx.emit("update:Tvisible", false);
@@ -287,8 +235,75 @@ export default {
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
+    
+    //获取任务管理列表
+    const getManageList = () => {
+      let obj = {
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: 0,
+      };
+      api
+        .taskStudentList(obj)
+        .then((res) => {
+          console.log("获取时间任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          // for (let i = 0; i < res.data.data.rows.length; i++) {
+          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          // }
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i].userInfoBo);
+            //需要确认值 赋给tablecolumns
+            console.log('state.tabledata',state.tabledata);
+          }
+        })
+        .catch((err) => {
+          console.log("获取时间任务列表失败", err);
+        });
+    };
+
+
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: state.name,
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: state.projectName,
+      };
+      api
+        .taskStudentList(objser)
+        .then((res) => {
+          console.log("获取任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          }
+        })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
+    };
+
+    //重置任务列表
+    const resetTaskList = () => {
+      state.name = "",
+      state.projectName="";
+      getManageList();
+    };
+
     let timer;
     onMounted(() => {
+      setTimeout(() => {
+        getManageList();
+      }, 1000);
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
@@ -304,6 +319,9 @@ export default {
       onMounted,
       onUnmounted,
       onChange,
+      getManageList,
+      searchTaskList,
+      resetTaskList,
     };
   },
 };
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index f8374472..e7ed4d26 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -43,11 +43,11 @@
             </div>
           </div>
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px">
+            <div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="resetTaskList">
               <div class="img2"></div>
               <div class="wz">重置</div>
             </div>
@@ -124,8 +124,9 @@
 </template>
 
 <script>
-import { toRefs, reactive } from "vue";
+import { toRefs, reactive,onMounted } from "vue";
 import WorkDetail from "../drawers/WorkDetail.vue";
+import * as api from "../../api/index";
 export default {
   name: "WorkManage",
   components: { WorkDetail },
@@ -149,6 +150,7 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
+      projectName:'',
       projectNameList: [
         {
           id: 1,
@@ -174,173 +176,60 @@ export default {
       tabledata: [
         {
           key: 1,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
+          userName: "哈哈",
+          deptName: "产品部",
+          jobName: "产品经理",
           comp: "好好学习",
           time: "-",
           state: "未完成",
         },
-        {
-          key: 2,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 3,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 4,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 5,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 6,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 7,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 8,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 9,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
-        {
-          key: 10,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "好好学习",
-          time: "2022-10-31  23:12:00",
-          state: "未完成",
-        },
       ],
       tablecolumns: [
         {
           title: "姓名",
-          dataIndex: "name",
-          key: "name",
+          dataIndex: "userName",
+          key: "userName",
           width: 50,
-          align: "center",
-          className: "h",
+          align: "left",
+          className: "h head",
         },
         {
           title: "所在部门",
-          dataIndex: "bum",
-          key: "bum",
-          width: 50,
+          dataIndex: "deptName",
+          key: "userName",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "所在岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 50,
+          dataIndex: "jobName",
+          key: "jobName",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
-          title: "所在小组",
-          dataIndex: "comp",
-          key: "comp",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "完成时间",
-          dataIndex: "time",
-          key: "time",
-          width: 100,
+          title: "课程成绩",
+          dataIndex: "score",
+          key: "score",
+          width: 60,
           align: "center",
           className: "h",
         },
         {
           title: "任务状态",
-          dataIndex: "state",
-          key: "state",
-          width: 50,
+          dataIndex: "status",
+          key: "status",
+          width: 60,
           align: "center",
           className: "h",
         },
-        {
-          title: "操作",
-          className: "h",
-          dataIndex: "opacation",
-          key: "opacation",
-          width: 50,
-          align: "center",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: () => {
-            return (
-              <div class="opa">
-                <div class="opacation">
-                  <span
-                    style="color:#4EA6FF;cursor:pointer"
-                    onClick={() => {
-                      showWorkDetail();
-                    }}
-                  >
-                    查看
-                  </span>
-                </div>
-              </div>
-            );
-          },
-        },
       ],
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
+      state.projectName = value
     };
     const closeDrawer = () => {
       ctx.emit("update:Wvisible", false);
@@ -357,6 +246,75 @@ export default {
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
+
+    //获取任务管理列表
+    const getManageList = () => {
+      let obj = {
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: 0,
+      };
+      api
+        .taskStudentList(obj)
+        .then((res) => {
+          console.log("获取作业任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          // for (let i = 0; i < res.data.data.rows.length; i++) {
+          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          // }
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i]);
+            //需要确认值 赋给tablecolumns
+            console.log('state.tabledata',state.tabledata);
+          }
+        })
+        .catch((err) => {
+          console.log("获取作业任务列表失败", err);
+        });
+    };
+
+
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: state.name,
+        pageNo: 0,
+        pageSize: 0,
+        projectTaskId: props.projectTaskId,
+        status: state.projectName,
+      };
+      api
+        .taskStudentList(objser)
+        .then((res) => {
+          console.log("获取任务管理列表成功", res);
+          // state.pageNo = res.data.data.pageNo
+          state.pageSize = res.data.data.pageSize;
+          state.pageSize = res.data.data.pageSize;
+          for (let i = 0; i < res.data.data.rows.length; i++) {
+            state.tabledata.push(res.data.data.rows[i].userInfoBo);
+          }
+        })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
+    };
+
+    //重置任务列表
+    const resetTaskList = () => {
+      state.name = "",
+      state.projectName="";
+      getManageList();
+    };
+
+    onMounted(() => {
+      setTimeout(() => {
+        getManageList();
+      }, 1000);
+    })
     return {
       ...toRefs(state),
       selectProjectName,
@@ -365,6 +323,9 @@ export default {
       closeModal,
       showWorkDetail,
       onChange,
+      getManageList,
+      searchTaskList,
+      resetTaskList,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 3211290a..ae4d5586 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -407,13 +407,13 @@
                           item.type == '11' ||
                           item.type == '12' ||
                           item.type == '9'
-                            ? showTime(item.course, item.name)
+                            ? showTime( item.name,item.projectTaskId)
                             : item.type == '5' || item.type == '10'
-                            ? showTest(item.course, item.name)
+                            ? showTest( item.name,item.projectTaskId)
                             : item.type == '2'
-                            ? showFace(item.course)
+                            ? showFace(item.projectTaskId)
                             : item.type == '4'
-                            ? showWork(item.course)
+                            ? showWork(item.projectTaskId)
                             : null
                         "
                       >
@@ -908,11 +908,11 @@
       </a-tabs>
     </div>
     <!-- 时间管理抽屉 -->
-    <time-manage v-model:Tvisible="visible" :title="showTimeText" v-model:ProjectTaskId="projectTaskId"/>
+    <time-manage v-model:Tvisible="visible" :title="showTimeText" :projectTaskId="projectTaskId"/>
     <!-- 面授管理抽屉 -->
     <face-manage
       v-model:Fvisible="FaceVisivle"
-      v-model:ProjectTaskId="projectTaskId"
+      :projectTaskId="projectTaskId"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
@@ -933,13 +933,13 @@
     <!-- 作业管理抽屉 -->
     <work-manage
       v-model:Wvisible="Wvisible"
-      v-model:ProjectTaskId="projectTaskId"
+      :projectTaskId="projectTaskId"
     />
     <!-- 考试管理抽屉 -->
     <test-manage
       v-model:TMvisible="TMvisible"
       :title="showTestText"
-      v-model:ProjectTaskId="projectTaskId"
+      :projectTaskId="projectTaskId"
     />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
@@ -1443,32 +1443,6 @@ export default {
         //   excellent: true,
         //   studentId: 22,
         // },
-        // {
-        //   key: 2,
-        //   name: "sss",
-        //   bum: "c",
-        //   gangw: "ss",
-        //   group: "sss",
-        //   progress: "sss",
-        //   diploma: "0",
-        //   stutime: "20202",
-        //   putin: "shs",
-        //   excellent: true,
-        //   studentId: 23,
-        // },
-        // {
-        //   key: 3,
-        //   name: "sss",
-        //   bum: "c",
-        //   gangw: "ss",
-        //   group: "sss",
-        //   progress: "sss",
-        //   diploma: "0",
-        //   stutime: "20202",
-        //   putin: "shs",
-        //   excellent: false,
-        //   studentId: 24,
-        // },
       ],
       //小组信息列表
       groupList: [],
@@ -1543,7 +1517,8 @@ export default {
       noticeChecked: true,
       noticeContent: "",
       TaskFaceImpStuvisible: false, //批量面授报名
-
+      morFaceT:false, //批量面授报名按钮
+      faceArr:[], //任务大纲列表所有name
       //进度排行表
       jindutabledata: [
         {
@@ -2033,14 +2008,28 @@ export default {
             console.log("res", res);
             console.log("阶段列表", res.data.data.stageList);
             console.log('任务id',res.data.data.stageList[0].taskList[0].projectTaskId)
-            //taskList[num] num应该是点那个就是那个数 
+            for (let i = 0; i < res.data.data.stageList.length; i++) {
+              for (let k = 0; k < res.data.data.stageList[i].taskList.length; k++) {
+                if (res.data.data.stageList[i].taskList[k].name == "面授") {
+                  //此处设置出现按钮参数
+                  state.morFaceT = true
+                  console.log(state.morFaceT,'state.morFaceT');
+                  break
+                }
+              }
+            }
+
+            //暂时传个固定的id用 到时候看数据里面是否有在更换
             state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId 
+
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               //获取任务列表 阶段
               let taskarr = res.data.data.stageList;
               state.taskSyllabus = taskarr;
+
               console.log("123456789", state.taskSyllabus);
+              //需要里面数据看是否有projectTaskId给管理弹窗
               // console.log(res.data.data.stageList[0].taskList[0].name, "ggg");
             }
           }
@@ -2175,17 +2164,18 @@ export default {
       state.TaskFaceImpStuvisible = true;
     };
     //新增
-    const showTime = (course) => {
+    const showTime = (name,id) => {
       console.log("点击管理");
       state.visible = true;
-      state.showTimeText = "【" + course + "】" + "管理";
-      // console.log("state.showTimeText", state.showTimeText);
+      state.showTimeText = name ;
+      state.projectTaskId = id;
     };
     //新增
-    const showFace = () => {
+    const showFace = (id) => {
       //面授管理的抽屉
       // console.log("点击管理");
       state.FaceVisivle = true;
+      state.projectTaskId= id
     };
     const showSubset = () => {
       //面授管理的抽屉
@@ -2206,13 +2196,15 @@ export default {
       state.showkaoqinText = "【" + course + "】" + "考勤";
     };
     //作业管理的抽屉
-    const showWork = () => {
+    const showWork = (id) => {
       state.Wvisible = true;
+      state.projectTaskId = id
     };
     //考试管理的抽屉
-    const showTest = (course, name) => {
+    const showTest = (name, id) => {
       state.TMvisible = true;
-      state.showTestText = "【" + course + "】" + name;
+      state.showTestText =  name   ;
+      state.projectTaskId = id
     };
     const showStuAdd = () => {
       state.Stuvisible = true;

From ce0e80402a3db61d64defc13ab60912d5efadf48 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Fri, 11 Nov 2022 18:07:48 +0800
Subject: [PATCH 25/90] =?UTF-8?q?feat:=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=A0=E5=80=BC=E6=9B=B4=E6=94=B9=20?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=E6=89=93=E5=BC=80=E9=87=8D=E6=96=B0=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/FaceManage.vue | 104 ++++++++++-----------
 src/components/drawers/TestManage.vue | 128 ++++++++++++-------------
 src/components/drawers/TimeManage.vue | 127 ++++++++++++-------------
 src/components/drawers/WorkManage.vue | 130 +++++++++++++-------------
 src/views/projectcenter/TaskPage.vue  |  83 +++++++++-------
 5 files changed, 287 insertions(+), 285 deletions(-)

diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index d159102b..d30f9203 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -49,7 +49,7 @@
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
-            <div class="btn btn2" @click="searchTaskList">
+            <div class="btn btn2" @click="resetTaskList">
               <div class="img2"></div>
               <div class="wz">重置</div>
             </div>
@@ -171,9 +171,10 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       Evisible: false, //录入成绩抽屉
-      name: null,
+      name: "",
       showmodal: false, //勾选提示框
       closable: false, //modal右上角的关闭按钮
+      pageNo: 1,
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
@@ -184,23 +185,18 @@ export default {
       projectNameList: [
         {
           id: 1,
-          value: "项目一",
-          label: "项目一",
+          value: "-1",
+          label: "未开始",
         },
         {
           id: 2,
-          value: "项目二",
-          label: "项目二",
+          value: "0",
+          label: "进行中",
         },
         {
           id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
+          value: "1",
+          label: "已完成",
         },
       ],
       tabledata: [
@@ -258,7 +254,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
-      state.projectName = value
+      state.projectName = value;
     };
     const closeDrawer = () => {
       ctx.emit("update:Fvisible", false);
@@ -303,47 +299,16 @@ export default {
     const getManageList = () => {
       let obj = {
         name: "",
-        pageNo: 0,
-        pageSize: 0,
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
         projectTaskId: props.projectTaskId,
-        status: 0,
+        status: -1,
       };
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log("获取面授任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
-          state.pageSize = res.data.data.pageSize;
-          state.pageSize = res.data.data.pageSize;
-          // for (let i = 0; i < res.data.data.rows.length; i++) {
-          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          // }
-          for (let i = 0; i < res.data.data.rows.length; i++) {
-            state.tabledata.push(res.data.data.rows[i]);
-            //需要确认值 赋给tablecolumns
-            console.log('state.tabledata',state.tabledata);
-          }
-        })
-        .catch((err) => {
-          console.log("获取面授任务列表失败", err);
-        });
-    };
-
-
-    //搜索任务列表
-    const searchTaskList = () => {
-      let objser = {
-        name: state.name,
-        pageNo: 0,
-        pageSize: 0,
-        projectTaskId: props.projectTaskId,
-        status: state.projectName,
-      };
-      api
-        .taskStudentList(objser)
-        .then((res) => {
-          console.log("获取任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
+          state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
           for (let i = 0; i < res.data.data.rows.length; i++) {
@@ -351,16 +316,49 @@ export default {
           }
         })
         .catch((err) => {
-          console.log("获取任务列表失败", err);
+          console.log("获取面授任务列表失败", err);
         });
     };
 
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: "",
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
+        projectTaskId: props.projectTaskId,
+        status: -1,
+      };
+      if (state.name !== "" || state.projectName !== "") {
+        api
+          .taskStudentList(objser)
+          .then((res) => {
+            state.pageNo = res.data.data.pageNo;
+            state.pageSize = res.data.data.pageSize;
+            state.pageSize = res.data.data.pageSize;
+            let newArr = [];
+            for (let i = 0; i < res.data.data.rows.length; i++) {
+              //少一个状态的参数判断状态
+              if (res.data.data.rows[i].userInfoBo.userName == state.name)
+                newArr.push(res.data.data.rows[i].userInfoBo);
+            }
+            state.tabledata = newArr;
+          })
+          .catch((err) => {
+            console.log("搜索任务列表失败", err);
+          });
+      }
+    };
+
     //重置任务列表
     const resetTaskList = () => {
-      state.name = "",
-      state.projectName="";
+      state.name = "";
+      state.projectName = "";
+      state.tabledata = [];
       getManageList();
     };
+
     let timer;
     onMounted(() => {
       setTimeout(() => {
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index f8619fbd..38f4a605 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -43,7 +43,11 @@
             </div>
           </div>
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
+            <div
+              class="btn btn1"
+              style="margin-right: 20px"
+              @click="searchTaskList"
+            >
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
@@ -123,50 +127,46 @@ export default {
     projectTaskId: {
       type: Number,
       default: null,
-    }
+    },
   },
 
   setup(props, ctx) {
     const state = reactive({
       name: null,
       open: false,
+      pageNo: 1,
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
-      projectName:'',
+      projectName: "",
       projectNameList: [
         {
           id: 1,
-          value: "项目一",
-          label: "项目一",
+          value: "-1",
+          label: "未开始",
         },
         {
           id: 2,
-          value: "项目二",
-          label: "项目二",
+          value: "0",
+          label: "进行中",
         },
         {
           id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
+          value: "1",
+          label: "已完成",
         },
       ],
       tabledata: [
-        {
-          key: 1,
-          name: "哈哈",
-          bum: "产品部",
-          gangw: "产品经理",
-          comp: "-",
-          score: "-",
-          time: "-",
-          state: "未完成",
-        },
+        // {
+        //   key: 1,
+        //   name: "哈哈",
+        //   bum: "产品部",
+        //   gangw: "产品经理",
+        //   comp: "-",
+        //   score: "-",
+        //   time: "-",
+        //   state: "未完成",
+        // },
       ],
       tablecolumns: [
         {
@@ -213,7 +213,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
-      state.projectName = value
+      state.projectName = value;
     };
     const closeDrawer = () => {
       ctx.emit("update:TMvisible", false);
@@ -229,47 +229,16 @@ export default {
     const getManageList = () => {
       let obj = {
         name: "",
-        pageNo: 0,
-        pageSize: 0,
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
         projectTaskId: props.projectTaskId,
-        status: 0,
+        status: -1,
       };
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log("获取测试任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
-          state.pageSize = res.data.data.pageSize;
-          state.pageSize = res.data.data.pageSize;
-          // for (let i = 0; i < res.data.data.rows.length; i++) {
-          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          // }
-          for (let i = 0; i < res.data.data.rows.length; i++) {
-            state.tabledata.push(res.data.data.rows[i]);
-            //需要确认值 赋给tablecolumns
-            console.log('state.tabledata',state.tabledata);
-          }
-        })
-        .catch((err) => {
-          console.log("获取测试任务列表失败", err);
-        });
-    };
-
-
-    //搜索任务列表
-    const searchTaskList = () => {
-      let objser = {
-        name: state.name,
-        pageNo: 0,
-        pageSize: 0,
-        projectTaskId: props.projectTaskId,
-        status: state.projectName,
-      };
-      api
-        .taskStudentList(objser)
-        .then((res) => {
-          console.log("获取任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
+          state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
           for (let i = 0; i < res.data.data.rows.length; i++) {
@@ -277,14 +246,45 @@ export default {
           }
         })
         .catch((err) => {
-          console.log("获取任务列表失败", err);
+          console.log("获取测试任务列表失败", err);
         });
     };
 
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: "",
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
+        projectTaskId: props.projectTaskId,
+        status: -1,
+      };
+      if (state.name !== "" || state.projectName !== "") {
+        api
+          .taskStudentList(objser)
+          .then((res) => {
+            state.pageNo = res.data.data.pageNo;
+            state.pageSize = res.data.data.pageSize;
+            state.pageSize = res.data.data.pageSize;
+            let newArr = [];
+            for (let i = 0; i < res.data.data.rows.length; i++) {
+              if (res.data.data.rows[i].userInfoBo.userName == state.name)
+                newArr.push(res.data.data.rows[i].userInfoBo);
+            }
+            state.tabledata = newArr;
+          })
+          .catch((err) => {
+            console.log("搜索任务列表失败", err);
+          });
+      }
+    };
+
     //重置任务列表
     const resetTaskList = () => {
-      state.name = "",
-      state.projectName="";
+      state.name = "";
+      state.projectName = "";
+      state.tabledata = [];
       getManageList();
     };
 
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 123bbb57..eae03011 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -123,61 +123,45 @@ export default {
     projectTaskId: {
       type: Number,
       default: null,
-    }
+    },
   },
 
   setup(props, ctx) {
     const state = reactive({
-      name: null,
+      visible: props.Tvisible,
+      name: "",
       open: false,
+      pageNo: 1,
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
-      projectName:'',
+      projectName: "",
       projectNameList: [
         {
           id: 1,
-          value: "项目一",
-          label: "项目一",
+          value: "-1",
+          label: "未开始",
         },
         {
           id: 2,
-          value: "项目二",
-          label: "项目二",
+          value: "0",
+          label: "进行中",
         },
         {
           id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
+          value: "1",
+          label: "已完成",
         },
       ],
       tabledata: [
-        {
-          key: 1,
-          userName: "哈哈",
-          deptName: "产品部",
-          gangw: "产品经理",
-          time: "-",
-          state: "未完成",
-        },
         // {
-        //   endStudyTime: 0,
-        //   name: "",
-        //   projectTaskId: 0,
-        //   status: 0,
-        //   studentId: 0,
-        //   userInfoBo: {
-        //     deptName: "1",
-        //     jobName: "2",
-        //     userId: 0,
-        //     userName: "3"
-        //   }
-        // }
+        //   key: 1,
+        //   userName: "哈哈",
+        //   deptName: "产品部",
+        //   gangw: "产品经理",
+        //   time: "-",
+        //   state: "未完成",
+        // },
       ],
       tablecolumns: [
         {
@@ -224,7 +208,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
-      state.projectName = value
+      state.projectName = value;
     };
     const closeDrawer = () => {
       ctx.emit("update:Tvisible", false);
@@ -235,67 +219,72 @@ export default {
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
-    
+
+    // watch(props.visible, ()=>{
+    //   getManageList()
+    // },{immediate:true});
     //获取任务管理列表
     const getManageList = () => {
       let obj = {
         name: "",
-        pageNo: 0,
-        pageSize: 0,
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
+        // projectTaskId: 370,
         projectTaskId: props.projectTaskId,
-        status: 0,
+        status: -1,
       };
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log("获取时间任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
+          console.log("csscas成功");
+          state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
-          // for (let i = 0; i < res.data.data.rows.length; i++) {
-          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          // }
           for (let i = 0; i < res.data.data.rows.length; i++) {
             state.tabledata.push(res.data.data.rows[i].userInfoBo);
-            //需要确认值 赋给tablecolumns
-            console.log('state.tabledata',state.tabledata);
           }
         })
         .catch((err) => {
-          console.log("获取时间任务列表失败", err);
+          console.log("获取时间任务列表失败cc", err);
         });
     };
 
-
     //搜索任务列表
     const searchTaskList = () => {
       let objser = {
-        name: state.name,
-        pageNo: 0,
-        pageSize: 0,
+        name: "",
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
         projectTaskId: props.projectTaskId,
-        status: state.projectName,
+        status: -1,
       };
-      api
-        .taskStudentList(objser)
-        .then((res) => {
-          console.log("获取任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
-          state.pageSize = res.data.data.pageSize;
-          state.pageSize = res.data.data.pageSize;
-          for (let i = 0; i < res.data.data.rows.length; i++) {
-            state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          }
-        })
-        .catch((err) => {
-          console.log("获取任务列表失败", err);
-        });
+      if (state.name !== "" || state.projectName !== "") {
+        api
+          .taskStudentList(objser)
+          .then((res) => {
+            state.pageNo = res.data.data.pageNo;
+            state.pageSize = res.data.data.pageSize;
+            state.pageSize = res.data.data.pageSize;
+            let newArr = [];
+            for (let i = 0; i < res.data.data.rows.length; i++) {
+              if (res.data.data.rows[i].userInfoBo.userName == state.name)
+                newArr.push(res.data.data.rows[i].userInfoBo);
+            }
+            state.tabledata = newArr;
+          })
+          .catch((err) => {
+            console.log("搜索任务列表失败", err);
+          });
+      }
     };
 
     //重置任务列表
     const resetTaskList = () => {
-      state.name = "",
-      state.projectName="";
+      state.name = "";
+      state.projectName = "";
+      state.tabledata = [];
       getManageList();
     };
 
@@ -303,7 +292,7 @@ export default {
     onMounted(() => {
       setTimeout(() => {
         getManageList();
-      }, 1000);
+      }, 500);
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index e7ed4d26..163d0d6a 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -43,7 +43,11 @@
             </div>
           </div>
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px" @click="searchTaskList">
+            <div
+              class="btn btn1"
+              style="margin-right: 20px"
+              @click="searchTaskList"
+            >
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
@@ -124,7 +128,7 @@
 </template>
 
 <script>
-import { toRefs, reactive,onMounted } from "vue";
+import { toRefs, reactive, onMounted } from "vue";
 import WorkDetail from "../drawers/WorkDetail.vue";
 import * as api from "../../api/index";
 export default {
@@ -138,7 +142,7 @@ export default {
     projectTaskId: {
       type: Number,
       default: null,
-    }
+    },
   },
 
   setup(props, ctx) {
@@ -147,42 +151,38 @@ export default {
       visible: false, //导出数据弹窗
       close: false, //导出弹窗的关闭按钮
       WDvisible: false, //作业详情
+      pageNo: 1,
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
-      projectName:'',
+      projectName: "",
       projectNameList: [
         {
           id: 1,
-          value: "项目一",
-          label: "项目一",
+          value: "-1",
+          label: "未开始",
         },
         {
           id: 2,
-          value: "项目二",
-          label: "项目二",
+          value: "0",
+          label: "进行中",
         },
         {
           id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
+          value: "1",
+          label: "已完成",
         },
       ],
       tabledata: [
-        {
-          key: 1,
-          userName: "哈哈",
-          deptName: "产品部",
-          jobName: "产品经理",
-          comp: "好好学习",
-          time: "-",
-          state: "未完成",
-        },
+        // {
+        //   key: 1,
+        //   userName: "哈哈",
+        //   deptName: "产品部",
+        //   jobName: "产品经理",
+        //   comp: "好好学习",
+        //   time: "-",
+        //   state: "未完成",
+        // },
       ],
       tablecolumns: [
         {
@@ -229,7 +229,7 @@ export default {
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
-      state.projectName = value
+      state.projectName = value;
     };
     const closeDrawer = () => {
       ctx.emit("update:Wvisible", false);
@@ -251,47 +251,16 @@ export default {
     const getManageList = () => {
       let obj = {
         name: "",
-        pageNo: 0,
-        pageSize: 0,
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
         projectTaskId: props.projectTaskId,
-        status: 0,
+        status: -1,
       };
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log("获取作业任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
-          state.pageSize = res.data.data.pageSize;
-          state.pageSize = res.data.data.pageSize;
-          // for (let i = 0; i < res.data.data.rows.length; i++) {
-          //   state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          // }
-          for (let i = 0; i < res.data.data.rows.length; i++) {
-            state.tabledata.push(res.data.data.rows[i]);
-            //需要确认值 赋给tablecolumns
-            console.log('state.tabledata',state.tabledata);
-          }
-        })
-        .catch((err) => {
-          console.log("获取作业任务列表失败", err);
-        });
-    };
-
-
-    //搜索任务列表
-    const searchTaskList = () => {
-      let objser = {
-        name: state.name,
-        pageNo: 0,
-        pageSize: 0,
-        projectTaskId: props.projectTaskId,
-        status: state.projectName,
-      };
-      api
-        .taskStudentList(objser)
-        .then((res) => {
-          console.log("获取任务管理列表成功", res);
-          // state.pageNo = res.data.data.pageNo
+          state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
           for (let i = 0; i < res.data.data.rows.length; i++) {
@@ -299,14 +268,45 @@ export default {
           }
         })
         .catch((err) => {
-          console.log("获取任务列表失败", err);
+          console.log("获取作业任务列表失败", err);
         });
     };
 
+    //搜索任务列表
+    const searchTaskList = () => {
+      let objser = {
+        name: "",
+        pageNo: state.pageNo,
+        pageSize: state.pageSize,
+        projectId: 27,
+        projectTaskId: props.projectTaskId,
+        status: -1,
+      };
+      if (state.name !== "" || state.projectName !== "") {
+        api
+          .taskStudentList(objser)
+          .then((res) => {
+            state.pageNo = res.data.data.pageNo;
+            state.pageSize = res.data.data.pageSize;
+            state.pageSize = res.data.data.pageSize;
+            let newArr = [];
+            for (let i = 0; i < res.data.data.rows.length; i++) {
+              if (res.data.data.rows[i].userInfoBo.userName == state.name)
+                newArr.push(res.data.data.rows[i].userInfoBo);
+            }
+            state.tabledata = newArr;
+          })
+          .catch((err) => {
+            console.log("搜索任务列表失败", err);
+          });
+      }
+    };
+
     //重置任务列表
     const resetTaskList = () => {
-      state.name = "",
-      state.projectName="";
+      state.name = "";
+      state.projectName = "";
+      state.tabledata = [];
       getManageList();
     };
 
@@ -314,7 +314,7 @@ export default {
       setTimeout(() => {
         getManageList();
       }, 1000);
-    })
+    });
     return {
       ...toRefs(state),
       selectProjectName,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ae4d5586..cb843101 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -220,7 +220,9 @@
             <div class="split"></div>
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <button class="btn" @click="showFaceIn" v-if="morFaceT">批量面授报名</button>
+              <button class="btn" @click="showFaceIn" v-if="morFaceT">
+                批量面授报名
+              </button>
               <router-link to="/taskadd">
                 <button to="/taskadd" class="edit">
                   <img
@@ -407,9 +409,9 @@
                           item.type == '11' ||
                           item.type == '12' ||
                           item.type == '9'
-                            ? showTime( item.name,item.projectTaskId)
+                            ? showTime(item.name, item.projectTaskId)
                             : item.type == '5' || item.type == '10'
-                            ? showTest( item.name,item.projectTaskId)
+                            ? showTest(item.name, item.projectTaskId)
                             : item.type == '2'
                             ? showFace(item.projectTaskId)
                             : item.type == '4'
@@ -908,10 +910,16 @@
       </a-tabs>
     </div>
     <!-- 时间管理抽屉 -->
-    <time-manage v-model:Tvisible="visible" :title="showTimeText" :projectTaskId="projectTaskId"/>
+    <time-manage
+      v-model:Tvisible.sync="visible"
+      v-if="visible"
+      :projectTaskId="projectTaskId"
+      :title="showTimeText"
+    />
     <!-- 面授管理抽屉 -->
     <face-manage
-      v-model:Fvisible="FaceVisivle"
+      v-model:Fvisible.sync="FaceVisivle"
+      v-if="FaceVisivle"
       :projectTaskId="projectTaskId"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
@@ -921,7 +929,11 @@
     <!-- 学员管理-导入学员抽屉 -->
     <import-stu v-model:Importvisible="Importvisible" />
     <!-- 查看学员 传入查看学员的id-->
-    <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId"/>
+    <see-stu
+      v-model:Seevisible="Seevisible"
+      v-model:checkStuId="checkStuId"
+      v-model:projectId="projectId"
+    />
     <!-- 学员换组 -->
     <change-group v-model:Changevisible="Changevisible" />
     <!-- 组员名单抽屉 -->
@@ -932,12 +944,14 @@
     <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
     <work-manage
-      v-model:Wvisible="Wvisible"
+      v-model:Wvisible.sync="Wvisible"
+      v-if="Wvisible"
       :projectTaskId="projectTaskId"
     />
     <!-- 考试管理抽屉 -->
     <test-manage
-      v-model:TMvisible="TMvisible"
+      v-model:TMvisible.sync="TMvisible"
+      v-if="Wvisible"
       :title="showTestText"
       :projectTaskId="projectTaskId"
     />
@@ -1455,7 +1469,8 @@ export default {
       selectedRowKeys: [], //选择的学员
       selectedRows: [], //选择的学员的id值
       chooseDeleteOne: [], //删除的单个学员id
-      projectTaskId:"", //项目任务id
+      // projectId:"", //项目任务id
+      projectTaskId: "", //项目任务任务id
       //进度排行学员
       rankjindu: [{ value: "学员", label: "学员" }],
       valuestu1: "学员",
@@ -1517,8 +1532,8 @@ export default {
       noticeChecked: true,
       noticeContent: "",
       TaskFaceImpStuvisible: false, //批量面授报名
-      morFaceT:false, //批量面授报名按钮
-      faceArr:[], //任务大纲列表所有name
+      morFaceT: false, //批量面授报名按钮
+      faceArr: [], //任务大纲列表所有name
       //进度排行表
       jindutabledata: [
         {
@@ -1986,7 +2001,6 @@ export default {
       level: null, //项目级别
       systemId: null, //培训体系
       picUrl: null,
-
     });
 
     // 输入接入 -- start --
@@ -2005,32 +2019,26 @@ export default {
         .getProjectDetail(objtl)
         .then((res) => {
           if (res.status == 200) {
-            console.log("res", res);
             console.log("阶段列表", res.data.data.stageList);
-            console.log('任务id',res.data.data.stageList[0].taskList[0].projectTaskId)
             for (let i = 0; i < res.data.data.stageList.length; i++) {
-              for (let k = 0; k < res.data.data.stageList[i].taskList.length; k++) {
+              for (
+                let k = 0;
+                k < res.data.data.stageList[i].taskList.length;
+                k++
+              ) {
                 if (res.data.data.stageList[i].taskList[k].name == "面授") {
-                  //此处设置出现按钮参数
-                  state.morFaceT = true
-                  console.log(state.morFaceT,'state.morFaceT');
-                  break
+                  state.morFaceT = true;
+                  break;
                 }
               }
             }
 
             //暂时传个固定的id用 到时候看数据里面是否有在更换
-            state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId 
-
+            // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-              //获取任务列表 阶段
               let taskarr = res.data.data.stageList;
               state.taskSyllabus = taskarr;
-
-              console.log("123456789", state.taskSyllabus);
-              //需要里面数据看是否有projectTaskId给管理弹窗
-              // console.log(res.data.data.stageList[0].taskList[0].name, "ggg");
             }
           }
         })
@@ -2164,10 +2172,10 @@ export default {
       state.TaskFaceImpStuvisible = true;
     };
     //新增
-    const showTime = (name,id) => {
-      console.log("点击管理");
+    const showTime = (name, id) => {
+      console.log("点击管理并传了id");
       state.visible = true;
-      state.showTimeText = name ;
+      state.showTimeText = name;
       state.projectTaskId = id;
     };
     //新增
@@ -2175,7 +2183,7 @@ export default {
       //面授管理的抽屉
       // console.log("点击管理");
       state.FaceVisivle = true;
-      state.projectTaskId= id
+      state.projectTaskId = id;
     };
     const showSubset = () => {
       //面授管理的抽屉
@@ -2198,13 +2206,13 @@ export default {
     //作业管理的抽屉
     const showWork = (id) => {
       state.Wvisible = true;
-      state.projectTaskId = id
+      state.projectTaskId = id;
     };
     //考试管理的抽屉
     const showTest = (name, id) => {
       state.TMvisible = true;
-      state.showTestText =  name   ;
-      state.projectTaskId = id
+      state.showTestText = name;
+      state.projectTaskId = id;
     };
     const showStuAdd = () => {
       state.Stuvisible = true;
@@ -2744,7 +2752,14 @@ export default {
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
         state.checkedBOEU = info.boeFlag == 1 ? true : false;
         state.picUrl = info.picUrl;
-        state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-"
+        state.sourceBelong =
+          info.sourceBelongId == 1
+            ? "项目一"
+            : info.sourceBelongId == 2
+            ? "项目二"
+            : info.sourceBelongId == 3
+            ? "项目三"
+            : "-";
       });
     };
     //获取小组列表

From 5083e55d79ac7b728b301d3b259c51a55e3c06ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Fri, 11 Nov 2022 18:07:56 +0800
Subject: [PATCH 26/90] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E5=BA=93?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=E5=92=8C=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/LibraryAdd.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index dcaca30a..c12d426c 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -187,7 +187,7 @@
                         }"
                         @click="showFS"
                       >
-                        学员
+                        <!-- 学员 -->
                       </div>
                       <div
                         class="operation"
@@ -200,7 +200,7 @@
                               : 'none',
                         }"
                       >
-                        考勤
+                        <!-- 考勤 -->
                       </div>
                       <div
                         class="operation"
@@ -214,7 +214,7 @@
                               : 'none',
                         }"
                       >
-                        二维码
+                        <!-- 二维码 -->
                       </div>
                       <div
                         class="operation"
@@ -238,7 +238,7 @@
                             : null
                         "
                       >
-                        管理
+                        <!-- 管理 -->
                       </div>
                     </div>
                   </div>

From 6690a69d806fe7b06a9d2e3c6421496c42c53f3d Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Fri, 11 Nov 2022 18:14:45 +0800
Subject: [PATCH 27/90] =?UTF-8?q?feat:=E5=85=AC=E5=91=8A=20=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E5=85=AC=E5=91=8A=20=20=E6=9B=B4=E6=94=B9=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=BC=98=E7=A7=80=20=E5=88=86=E9=A1=B5=20=E7=BB=84?=
 =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95=E5=AF=B9=E6=8E=A5=20=20=E7=BB=84?=
 =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95=E5=90=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js                |   5 +-
 src/api/indexTaskadd.js                |   3 +
 src/components/drawers/ChangeGroup.vue |  72 ++++--
 src/components/drawers/MemberList.vue  | 333 ++++++++++++++++++-------
 src/components/drawers/NoticeHis.vue   | 105 ++++++++
 src/components/drawers/NoticePub.vue   | 216 ++++++++++------
 src/views/projectcenter/TaskPage.vue   | 294 ++++++++++++++--------
 7 files changed, 752 insertions(+), 276 deletions(-)
 create mode 100644 src/components/drawers/NoticeHis.vue

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 8d9ddff3..28d77063 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -16,4 +16,7 @@ export const deleteGroup = (obj) => http.delete('/admin/project/deleteGroup', {
 export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
 
 //查看学员
-export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
\ No newline at end of file
+export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
+
+//是否优秀学员
+export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
\ No newline at end of file
diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index dd8001d2..ac0f16bf 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -12,3 +12,6 @@ export const addTask = (obj) => http.post('/admin/project/editTask', obj)
 
 //项目里的删除任务
 export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { params: obj })
+
+//新建或编辑项目
+export const editProj = (obj) => http.post('/admin/project/edit', obj)
diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 6447ff12..2059425d 100644
--- a/src/components/drawers/ChangeGroup.vue
+++ b/src/components/drawers/ChangeGroup.vue
@@ -19,12 +19,12 @@
         <div class="onerow">将此学员移动到</div>
         <div class="secondrow">
           <a-select
-            v-model:value="value"
+            v-model:value="groupValue"
             style="width: 264px; border-radius: 8px"
-            placeholder="好好学习"
             :options="stugroupList"
             allowClear
             showSearch
+            @change="handleChange"
           />
         </div>
       </div>
@@ -38,6 +38,7 @@
 
 <script>
 import { reactive, toRefs } from "vue";
+import { getGroupList } from "../../api/indexProjStu";
 export default {
   name: "ChangeGroup",
   props: {
@@ -45,39 +46,76 @@ export default {
       type: Boolean,
       default: false,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       stugroupList: [
-        {
-          id: "1",
-          value: "好好学习",
-          label: "好好学习",
-        },
-        {
-          id: "2",
-          value: "天天向上",
-          label: "天天向上",
-        },
-        {
-          id: "3",
-          value: "最强小组",
-          label: "最强小组",
-        },
+        // {
+        //   id: "1",
+        //   value: "好好学习",
+        //   label: "好好学习",
+        // },
+        // {
+        //   id: "2",
+        //   value: "天天向上",
+        //   label: "天天向上",
+        // },
+        // {
+        //   id: "3",
+        //   value: "最强小组",
+        //   label: "最强小组",
+        // },
       ],
+      groupValue: null, //下拉框选择的值
     });
     const closeDrawer = () => {
       ctx.emit("update:Changevisible", false);
     };
+    const setStuGroups = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          id: value.projectGroupId,
+          value: value.groupName,
+          label: value.groupName,
+        };
+        array.push(obj);
+      });
+      state.stugroupList = array;
+    };
 
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      let obj = {
+        name: "",
+        pageNo: 1,
+        pageSize: 12,
+        projectId: props.projectId,
+      };
+
+      getGroupList(obj).then((res) => {
+        console.log("在抽屉里获取了小组列表", res.data.data.rows);
+        let result = res.data.data.rows;
+        if (result.length > 0) {
+          setStuGroups(result);
+        }
+      });
+    };
+    const handleChange = (value) => {
+      console.log(`selected ${value}`);
     };
 
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
+      setStuGroups,
+      handleChange,
       // change,
     };
   },
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index f10227a1..bca5a37c 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -27,11 +27,11 @@
           </div>
 
           <div class="btns">
-            <div class="btn btn1" style="margin-right: 20px">
+            <div class="btn btn1" style="margin-right: 20px" @click="searchStu">
               <div class="img1"></div>
               <div class="wz">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="resetSearch">
               <div class="img2"></div>
               <div class="wz">重置</div>
             </div>
@@ -56,10 +56,10 @@
             <div class="left">
               <div class="img"></div>
               <div class="text" style="margin-left: 10px">已选择</div>
-              <div class="text2">2</div>
+              <div class="text2">{{ choosed }}</div>
               <div class="text">项</div>
               <div class="text3">列表选项总计：</div>
-              <div class="text4">9条</div>
+              <div class="text4">{{ total }}条</div>
             </div>
             <div class="right">清空</div>
           </div>
@@ -82,13 +82,15 @@
           />
           <div class="pa">
             <a-pagination
+              v-if="total > 10"
               showSizeChanger="true"
               showQuickJumper="true"
               hideOnSinglePage="true"
               :pageSize="pageSize"
               :current="currentPage"
-              :total="tableDataTotal"
+              :total="total"
               class="pagination"
+              @change="changePaginationStu"
             />
           </div>
         </div>
@@ -97,7 +99,7 @@
         <button class="btn1">取消</button>
         <button class="btn2">确定</button>
       </div>
-
+      <!-- 批量删除的弹窗 -->
       <a-modal
         :closable="closable"
         v-model:visible="showmodal"
@@ -117,7 +119,30 @@
         <div class="main">请确认是否批量删除组员</div>
         <div class="butn">
           <button class="btn btn1" @click="closeModal">取消</button>
-          <button class="btn btn2" @click="closeModal">确定</button>
+          <button class="btn btn2" @click="sureDeModal">确定</button>
+        </div>
+      </a-modal>
+      <!-- 单独删除的弹窗 -->
+      <a-modal
+        :closable="closable"
+        v-model:visible="deone"
+        centered="true"
+        :footer="null"
+        wrapClassName="FacMa"
+      >
+        <div class="head">
+          <div class="inhead">
+            <div class="left">
+              <img src="../../assets/images/coursewareManage/notice.png" />
+              <div class="tis">提示</div>
+            </div>
+            <div class="right" @click="closedeleone"></div>
+          </div>
+        </div>
+        <div class="main">请确认是否批量删除组员</div>
+        <div class="butn">
+          <button class="btn btn1" @click="closedeleone">取消</button>
+          <button class="btn btn2" @click="yesdele">确定</button>
         </div>
       </a-modal>
       <stu-add v-model:Stuvisible="Stuvisible" />
@@ -128,6 +153,9 @@
 <script>
 import { toRefs, reactive } from "vue";
 import StuAdd from "./StuAdd.vue";
+import { getProjStu, deleteStu } from "../../api/indexProjStu";
+import { toDate } from "../../api/method";
+import { message } from "ant-design-vue";
 export default {
   name: "MemberList",
   components: { StuAdd },
@@ -136,6 +164,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    chooseGroupId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
   },
 
   setup(props, ctx) {
@@ -144,85 +180,25 @@ export default {
       name: null,
       showmodal: false,
       closable: false, //modal右上角的关闭按钮
-
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 100,
-
+      total: null,
+      selectedRowKeys: [],
+      choosed: 0, //勾选的学员总数
+      selectedRows: [], //选择的学员的id值
+      deleteOne: null,
+      deone: false,
       tabledata: [
-        {
-          key: 1,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 2,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 3,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 4,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 5,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 6,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 7,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 8,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
-        {
-          key: 9,
-          name: "小李",
-          bum: "产品部",
-          gangw: "产品经理",
-          progress: "20%",
-          operations: "删除",
-        },
+        // {
+        //   key: 1,
+        //   name: "小李",
+        //   bum: "产品部",
+        //   gangw: "产品经理",
+        //   progress: "20%",
+        //   operations: "删除",
+        // },
       ],
+
       tablecolumns: [
         {
           title: "姓名",
@@ -263,6 +239,18 @@ export default {
           width: 60,
           align: "center",
           className: "operation",
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (value) => {
+            return (
+              <div
+                onClick={() => {
+                  deleteOne(value.record.key);
+                }}
+              >
+                删除
+              </div>
+            );
+          },
         },
       ],
     });
@@ -270,7 +258,31 @@ export default {
       ctx.emit("update:Lvisible", false);
     };
     const showModal = () => {
-      state.showmodal = true;
+      if (state.selectedRows.length == 0) {
+        message.destroy();
+        return message.warning("请选择要删除的学员");
+      } else {
+        state.showmodal = true;
+      }
+      // state.showmodal = true;
+    };
+    //点击确认批量删除弹窗
+    const sureDeModal = () => {
+      deleteStu({
+        projectId: props.projectId,
+        studentIds: state.selectedRows,
+      })
+        .then((res) => {
+          console.log(res, "删除成功");
+          message.success("删除成功");
+          state.selectedRows = [];
+          getStu();
+        })
+        .catch((err) => {
+          console.log(err, "删除失败");
+          message.warning("删除失败");
+        });
+      state.showmodal = false;
     };
     const closeModal = () => {
       state.showmodal = false;
@@ -278,14 +290,167 @@ export default {
     const showStuAdd = () => {
       state.Stuvisible = true;
     };
+    //把数据放到state里
+    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,
+
+          stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
+        };
+        array.push(obj);
+      });
+      state.tabledata = array;
+    };
+    //获取学员列表
+    const getStu = (obj) => {
+      let objf = obj || {
+        deptIds: [], //部门
+        groupName: "",
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectId: props.projectId,
+        topFlag: "",
+        groupId: 10, //暂时写死
+      };
+      getProjStu(objf).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);
+        }
+      });
+    };
+
+    const afterVisibleChange = () => {
+      getStu();
+    };
+    //分页
+    const changePaginationStu = (page) => {
+      state.currentPage = page;
+      getStu();
+    };
+    //勾选学员
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+      state.choosed = state.selectedRowKeys.length;
+      console.log("ssss", selectedRows);
+      state.selectedRows = [];
+      console.log("before", state.selectedRows);
+      // let arr = [];
+      //遍历 插入到state.selectedRows里
+      selectedRows.map((item) => {
+        console.log(item.studentId);
+        state.selectedRows.push(item.studentId);
+        // arr.push(item.studentId);
+        // console.log("asdfasdf", arr);
+      });
+      // state.selectedRows = arr;
+      console.log("after", state.selectedRows);
+      // console.log(state.selectedRows[0]);
+      // console.log("dddd",selectedRows.)
+      //判断是否为数组
+      // console.log("wwwwww", Object.prototype.toString.call(state.selectedRows));
+    };
+
+    //清空所选的学员
+    const clearChooseStu = () => {
+      state.selectedRowKeys = [];
+      state.choosed = 0;
+    };
+    //学员搜索
+    const searchStu = () => {
+      let obj = {
+        deptIds: [], //部门
+        groupName: "",
+        name: state.name,
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectId: props.projectId,
+        topFlag: "",
+      };
+      //重新获取列表
+      getStu(obj);
+    };
+    //重置
+    const resetSearch = () => {
+      state.name = null;
+      let obj = {
+        deptIds: [], //部门
+        groupName: "",
+        name: "",
+        pageNo: 1,
+        pageSize: 10,
+        projectId: props.projectId,
+        topFlag: "",
+      };
+      //重新获取列表
+      getStu(obj);
+    };
+    const deleteOne = (id) => {
+      // console.log(id, "fewfew");
+      console.log(`${id}`);
+      state.deone = true;
+      state.selectedRows.push(id);
+    };
+    //点击取消删除单个学员
+    const closedeleone = () => {
+      state.deone = false;
+      state.selectedRows = [];
+    };
+    const yesdele = () => {
+      state.deone = false;
+      deleteStu({
+        projectId: props.projectId,
+        studentIds: state.selectedRows,
+      })
+        .then((res) => {
+          console.log(res, "单个删除成功");
+          message.success("删除成功");
+          getStu();
+        })
+        .catch((err) => {
+          console.log(err, "单个删除失败");
+          message.warning("删除失败");
+        });
+      state.selectedRows = [];
+    };
 
     return {
       ...toRefs(state),
       closeDrawer,
-
       showModal,
       closeModal,
       showStuAdd,
+      getStu,
+      getTableDataList,
+      afterVisibleChange,
+      changePaginationStu,
+      clearChooseStu,
+      onSelectChange,
+      searchStu,
+      resetSearch,
+      sureDeModal,
+      deleteOne,
+      closedeleone,
+      yesdele,
     };
   },
 };
diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
new file mode 100644
index 00000000..3e0012b6
--- /dev/null
+++ b/src/components/drawers/NoticeHis.vue
@@ -0,0 +1,105 @@
+<!--发布公告-->
+<template>
+  <!-- <div class="split"></div> -->
+  <div class="noticeconTitle">
+    <!-- <div class="notitle"><span class="titlespan">公告</span></div> -->
+    <div>公告内容</div>
+    <div>发布时间</div>
+  </div>
+  <div class="noticeContent">
+    <div v-for="item in notice" :key="item.id" class="item">
+      <div class="itemcontent">{{ item.content }}</div>
+      <div class="itemtime">{{ item.pubtime }}</div>
+    </div>
+  </div>
+</template>s
+<script>
+import { reactive, toRefs, onMounted } from "vue";
+import { getTask } from "../../api/indexTaskadd";
+export default {
+  name: "NoticeHis",
+  props: {
+    projectId: {
+      type: Number,
+      default: null,
+    },
+  },
+
+  setup(props) {
+    const state = reactive({
+      noticeChecked: true,
+      notice: [
+        // {
+        //   id: 1,
+        //   content:
+        //     "jwlfwefefweffjwofiewjffwefwowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefwef",
+        //   pubtime: "2022-11-7    12:23:00",
+        // },
+        // {
+        //   id: 2,
+        //   content: "fjwofiewjfowefjwlfwefwefwefwef",
+        //   pubtime: "2022-11-7    12:23:00",
+        // },
+      ],
+      projectInfo: {},
+    });
+    const getTaskInfo = () => {
+      getTask({ projectId: props.projectId }).then((res) => {
+        console.log("公告获取项目", res.data.data.projectInfo);
+        state.projectInfo = res.data.data.projectInfo;
+        //下一步是把公告赋值给state.notice
+      });
+    };
+    onMounted(() => {
+      getTaskInfo();
+    });
+    return {
+      ...toRefs(state),
+      getTaskInfo,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.noticeconTitle {
+  // margin-left: 32px;
+  // margin-right: 32px;
+  // padding-top: 20px;
+  margin: 20px 32px 0 32px;
+  width: 70%;
+  // background-color: #bfa;
+  display: flex;
+  justify-content: space-between;
+}
+.noticeContent {
+  margin-top: 20px;
+  margin-left: 32px;
+  .item {
+    height: 66px;
+    width: 74%;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+    .itemcontent {
+      width: 500px;
+      word-break: break-all;
+      word-wrap: break-word;
+      // overflow: hidden;
+      // text-overflow: ellipsis;
+      white-space: wrap;
+      font-size: 14px;
+      font-weight: 400;
+      color: #666666;
+      line-height: 22px;
+    }
+    .itemtime {
+      font-size: 14px;
+      font-weight: 400;
+      color: #666666;
+      line-height: 22px;
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index d36f32b6..4ecf4e49 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -1,85 +1,159 @@
 <!--发布公告-->
 <template>
-    <div class="split"></div>
-    <div class="noticeTitle">
-        <div class="notitle"><span class="titlespan">公告</span></div>
-        <div class="switch"><a-switch v-model:checked="noticeChecked" size="small"/><span style="margin-left: 16px;">开启</span></div>
-        <template v-if="noticeChecked">
-            <p>公告内容</p>
-            <a-textarea v-model:value="noticeContent" :maxlength="150" placeholder="公告信息最多输入150个字" style="margin-top: -10px;height: 120px;"/>
-            <div class="publish"><div class="iconPub"></div><div class="btnText">发布</div></div>
-        </template>
-        
-       
+  <!-- <div class="split"></div> -->
+  <div class="noticeTitle">
+    <!-- <div class="notitle"><span class="titlespan">公告</span></div> -->
+    <div class="switch">
+      <a-switch v-model:checked="noticeChecked" size="small" /><span
+        style="margin-left: 16px"
+        >开启</span
+      >
+    </div>
+    <template v-if="noticeChecked">
+      <p>公告内容</p>
+      <a-textarea
+        v-model:value="noticeContent"
+        :maxlength="150"
+        placeholder="公告信息最多输入150个字"
+        style="margin-top: -10px; height: 120px"
+      />
+      <div class="publish">
+        <div class="iconPub"></div>
+        <div class="btnText" @click="pubNotice">发布</div>
       </div>
+    </template>
+  </div>
 </template>s
 <script>
-import { reactive,toRefs} from "vue";
+import { message } from "ant-design-vue";
+import { reactive, toRefs, onMounted } from "vue";
+import { getTask } from "../../api/indexTaskadd";
+import { editProj } from "../../api/indexTaskadd";
 export default {
-    name: "NoticePub",
-    setup(){
-      const state = reactive({
+  name: "NoticePub",
+  props: {
+    projectId: {
+      type: Number,
+      default: null,
+    },
+  },
+  setup(props) {
+    const state = reactive({
       noticeChecked: true,
+      projectInfo: {},
+      noticeContent: "",
     });
-    return{
+    const getTaskInfo = () => {
+      getTask({ projectId: props.projectId }).then((res) => {
+        console.log("公告获取项目", res.data.data.projectInfo);
+        state.projectInfo = res.data.data.projectInfo;
+      });
+    };
+    const pubNotice = () => {
+      if (state.noticeContent == "") {
+        message.destroy();
+        return message.warning("请输入公告内容");
+      } else {
+        let result = state.projectInfo;
+        let obj = {
+          attach: result.attach,
+          beginTime: result.beginTime,
+          boeFlag: result.boeFlag,
+          category: result.category,
+          courseSyncFlag: result.courseSyncFlag,
+          endTime: result.endTime,
+          level: result.level,
+          manager: result.manager,
+          managerId: result.managerId,
+          name: result.name,
+          notice: state.noticeContent,
+          noticeFlag: 1,
+          parentId: result.parentId,
+          picUrl: result.picUrl,
+          projectId: result.projectId,
+          remark: result.remark,
+          sourceBelongId: result.sourceBelongId,
+          status: result.status,
+          systemId: result.systemId,
+          templateId: result.templateId,
+          type: result.type,
+        };
+        // console.log(result, obj, result.type);
+        editProj(obj)
+          .then((res) => {
+            message.destroy();
+            message.success("发布成功", res);
+            state.noticeContent = null;
+          })
+          .catch((err) => {
+            message.destroy();
+            message.warning("发布失败");
+            console.log(err);
+          });
+      }
+    };
+    onMounted(() => {
+      getTaskInfo();
+    });
+    return {
       ...toRefs(state),
-    }
-    }
-   
-}
+      getTaskInfo,
+      pubNotice,
+    };
+  },
+};
 </script>
 <style lang="scss">
-    .noticeTitle {
-        margin-left: 32px;
-        margin-right: 32px;
-        padding-top: 20px;
-        .notitle{
-            height: 55px;
-            border-bottom:1px solid #ededed;
-            position: relative;
-            .titlespan{
-                font-size: 18px;
-                position: absolute;
-                left: 0;
-                bottom: 0px;
-             }
-        }
-        .switch{
-            display: flex;
-            align-items: center;
-            height: 90px;
-        }
-
-        .publish {
-            width: 100px;
-            height:38px;
-            background: rgb(64, 158, 255);
-            border-radius: 8px;
-            border: 1px solid rgba(64, 158, 255, 1);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            flex-shrink: 0;
-            float: right;
-            margin-top: 24px;
-            margin-bottom: 60px;
-            margin-right: 20px;
-            cursor: pointer;
-            .iconPub {
-                width: 15px;
-                height: 15px;
-                background-image: url(@/assets/images/taskpage/pub0.png);
-                background-size: 100% 100%;
-                color: rgb(255, 255, 255);
-            }
-            .btnText {
-                font-size: 14px;
-                font-weight: 400;
-                color: rgb(255, 255, 255);
-                line-height: 36px;
-                margin-left: 5px;
-            }
-         }
+.noticeTitle {
+  margin-left: 32px;
+  margin-right: 32px;
+  // padding-top: 20px;
+  .notitle {
+    height: 55px;
+    border-bottom: 1px solid #ededed;
+    position: relative;
+    .titlespan {
+      font-size: 18px;
+      position: absolute;
+      left: 0;
+      bottom: 0px;
     }
+  }
+  .switch {
+    display: flex;
+    align-items: center;
+    height: 90px;
+  }
 
+  .publish {
+    width: 100px;
+    height: 38px;
+    background: rgb(64, 158, 255);
+    border-radius: 8px;
+    border: 1px solid rgba(64, 158, 255, 1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    float: right;
+    margin-top: 24px;
+    margin-bottom: 60px;
+    margin-right: 20px;
+    cursor: pointer;
+    .iconPub {
+      width: 15px;
+      height: 15px;
+      background-image: url(@/assets/images/taskpage/pub0.png);
+      background-size: 100% 100%;
+      color: rgb(255, 255, 255);
+    }
+    .btnText {
+      font-size: 14px;
+      font-weight: 400;
+      color: rgb(255, 255, 255);
+      line-height: 36px;
+      margin-left: 5px;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 163d1cae..69247d7f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -571,18 +571,23 @@
                       onChange: onSelectChange,
                     }"
                   />
-                  <div class="nostu" style="display: block">
+                  <div
+                    class="nostu"
+                    :style="{ display: total > 0 ? 'none' : 'block' }"
+                  >
                     <div class="nostuimg"></div>
                   </div>
                   <div class="pa">
                     <a-pagination
+                      v-if="total > 10"
                       showSizeChanger="true"
                       showQuickJumper="true"
                       hideOnSinglePage="true"
-                      :pageSize="pageSize"
-                      :current="currentPage"
-                      :total="tableDataTotal"
+                      :pageSize="stupageSize"
+                      :current="currentPageStu"
+                      :total="total"
                       class="pagination"
+                      @change="changePaginationStu"
                     />
                   </div>
                 </div>
@@ -648,7 +653,10 @@
                         <div class="leader1">进度</div>
                         <a-progress :percent="item.completeRatio" />
                       </div>
-                      <div class="grofooter" @click="showMemberList">
+                      <div
+                        class="grofooter"
+                        @click="showMemberList(item.projectGroupId)"
+                      >
                         <div class="ftext">组员名单 ></div>
                         <div class="peoples">
                           <div class="people1">
@@ -681,7 +689,13 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="4" tab="公告">
-          <NoticePub></NoticePub>
+          <div class="split"></div>
+          <a-tabs v-model:activeKey="activeKeyNotice">
+            <a-tab-pane key="11" tab="公告"><NoticePub v-model:projectId="projectId"></NoticePub></a-tab-pane>
+            <a-tab-pane key="12" tab="历史公告" force-render
+              ><NoticeHis  v-model:projectId="projectId"></NoticeHis></a-tab-pane
+            >
+          </a-tabs>
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
           <ProjectScore :projectId="projectId"></ProjectScore>
@@ -922,11 +936,22 @@
     <!-- 学员管理-导入学员抽屉 -->
     <import-stu v-model:Importvisible="Importvisible" />
     <!-- 查看学员 传入查看学员的id-->
-    <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId"/>
+    <see-stu
+      v-model:Seevisible="Seevisible"
+      v-model:checkStuId="checkStuId"
+      v-model:projectId="projectId"
+    />
     <!-- 学员换组 -->
-    <change-group v-model:Changevisible="Changevisible" />
+    <change-group
+      v-model:Changevisible="Changevisible"
+      v-model:projectId="projectId"
+    />
     <!-- 组员名单抽屉 -->
-    <member-list v-model:Lvisible="Lvisible" />
+    <member-list
+      v-model:Lvisible="Lvisible"
+      v-model:chooseGroupId="chooseGroupId"
+      v-model:projectId="projectId"
+    />
     <!-- 面授学员抽屉 -->
     <face-stu v-model:FSvisible="FSvisible" />
     <!-- 活动考勤抽屉 -->
@@ -1117,7 +1142,7 @@
             </div>
             <div class="del_btnbox">
               <div class="del_btn btn1">
-                <div class="btnText" @click="closeModal1">取消</div>
+                <div class="btnText" @click="cancelyou">取消</div>
               </div>
               <div class="del_btn btn2">
                 <div class="btnText" @click="closeModal1">确定</div>
@@ -1149,7 +1174,7 @@
             </div>
             <div class="del_btnbox">
               <div class="del_btn btn1">
-                <div class="btnText" @click="closeModal3">取消</div>
+                <div class="btnText" @click="cancelcanyou">取消</div>
               </div>
               <div class="del_btn btn2">
                 <div class="btnText" @click="closeModal3">确定</div>
@@ -1363,6 +1388,7 @@ import ImportStu from "../../components/drawers/ImportStu";
 import SeeStu from "../../components/drawers/SeeStu";
 import ChangeGroup from "../../components/drawers/ChangeGroup";
 import NoticePub from "../../components/drawers/NoticePub";
+import NoticeHis from "../../components/drawers/NoticeHis";
 import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import { storage } from "../../api/storage";
@@ -1373,6 +1399,7 @@ import {
   getGroupList,
   deleteGroup,
   editGroup,
+  topStudent,
 } from "../../api/indexProjStu";
 import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
@@ -1399,6 +1426,7 @@ export default {
     ProjectScore,
     TaskImpStu,
     projSet,
+    NoticeHis,
   },
   setup() {
     const state = reactive({
@@ -1429,6 +1457,7 @@ export default {
           label: "",
         },
       ],
+      changeGoods: [], //更改是否优秀的id数组
       //学员信息列表
       tabledata: [
         // {
@@ -1477,7 +1506,9 @@ export default {
       // stuGroup: "", //搜索的学员小组名称
       // stuBum: "", //搜索的学员小组部门
       // stuGood: "", //搜索的学员是否优秀
-      total: null, //学员列表数据总条数
+      total: 0, //学员列表数据总条数
+      stupageSize: 10,
+      currentPageStu: 1, //当前页
       choosed: 0, //勾选的学员总数
       selectedRowKeys: [], //选择的学员
       selectedRows: [], //选择的学员的id值
@@ -1527,9 +1558,10 @@ export default {
       checkedBOEU: false, //是否BOEU实施
       radioV1: "",
       radioV2: "",
-      activeKey: "5", //1:概览 2.任务...
+      activeKey: "4", //1:概览 2.任务...
       activeKey1: "8", //8:学员管理 9：小组管理
       activeKey2: "3",
+      activeKeyNotice: "11",
       inputValue: 5,
       inputValue2: 5,
       inputValue3: 5,
@@ -1546,6 +1578,7 @@ export default {
       TaskFaceImpStuvisible: false, //批量面授报名
       valuestugn: "", //小组管理的输入的小组名称
       checkStuId: null, //要查看的学员id
+      chooseGroupId: null,
       //进度排行表
       jindutabledata: [
         {
@@ -2055,77 +2088,77 @@ export default {
     };
 
     //学员学员管理渲染
-    const getTableDate = () => {
-      let datas = state.tabledata;
-      datas.map((value) => {
-        {
-          //单层项目
-          value.operations = (
-            <div class="operation">
-              <div class="nSelect">
-                <div class="nselect">
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      // state.QR_hs = true;
-                      // state.ftsQR_hs = true;
-                      state.canclestu = true;
-                    }}
-                  >
-                    优秀学员
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      state.Seevisible = true;
-                    }}
-                  >
-                    查看
-                  </div>
-                  <div class="tableSelect">
-                    <a-select
-                      style="width: 50px;margin-top:2px;margin-left:25px"
-                      value="更多"
-                      // options={state.projectNameList}
-                      dropdownClassName="tabledropdown"
-                    >
-                      <a-select-option
-                        value="换组"
-                        label="换组"
-                        style="padding-left:35px"
-                      >
-                        <div
-                          onClick={() => {
-                            // state.copy_hs = true;
-                          }}
-                        >
-                          复制
-                        </div>
-                      </a-select-option>
-                      <a-select-option
-                        value="删除"
-                        label="删除"
-                        style="padding-left:35px"
-                      >
-                        <div
-                          onClick={() => {
-                            state.delete_hs = true;
-                          }}
-                        >
-                          删除
-                        </div>
-                      </a-select-option>
-                    </a-select>
-                  </div>
-                </div>
-              </div>
-            </div>
-          );
-        }
-      });
-      state.tableData = datas;
-    };
-    getTableDate();
+    // const getTableDate = () => {
+    //   let datas = state.tabledata;
+    //   datas.map((value) => {
+    //     {
+    //       //单层项目
+    //       value.operations = (
+    //         <div class="operation">
+    //           <div class="nSelect">
+    //             <div class="nselect">
+    //               <div
+    //                 class="jc"
+    //                 onClick={() => {
+    //                   // state.QR_hs = true;
+    //                   // state.ftsQR_hs = true;
+    //                   state.canclestu = true;
+    //                 }}
+    //               >
+    //                 优秀学员
+    //               </div>
+    //               <div
+    //                 class="jc"
+    //                 onClick={() => {
+    //                   state.Seevisible = true;
+    //                 }}
+    //               >
+    //                 查看
+    //               </div>
+    //               <div class="tableSelect">
+    //                 <a-select
+    //                   style="width: 50px;margin-top:2px;margin-left:25px"
+    //                   value="更多"
+    //                   // options={state.projectNameList}
+    //                   dropdownClassName="tabledropdown"
+    //                 >
+    //                   <a-select-option
+    //                     value="换组"
+    //                     label="换组"
+    //                     style="padding-left:35px"
+    //                   >
+    //                     <div
+    //                       onClick={() => {
+    //                         // state.copy_hs = true;
+    //                       }}
+    //                     >
+    //                       复制
+    //                     </div>
+    //                   </a-select-option>
+    //                   <a-select-option
+    //                     value="删除"
+    //                     label="删除"
+    //                     style="padding-left:35px"
+    //                   >
+    //                     <div
+    //                       onClick={() => {
+    //                         state.delete_hs = true;
+    //                       }}
+    //                     >
+    //                       删除
+    //                     </div>
+    //                   </a-select-option>
+    //                 </a-select>
+    //               </div>
+    //             </div>
+    //           </div>
+    //         </div>
+    //       );
+    //     }
+    //   });
+    //   state.tableData = datas;
+    // };
+    // getTableDate();
 
     const totask = () => {
       state.activeKey = "2";
@@ -2143,13 +2176,59 @@ export default {
     const showModal1 = () => {
       state.canclestu = true;
     };
+    //点击确定授予优秀学员后
     const closeModal1 = () => {
+      let obj = {
+        projectId: state.projectId,
+        studentIds: state.changeGoods,
+        topFlag: 1,
+      };
+      topStudent(obj)
+        .then((res) => {
+          console.log(`优秀学员授予成功${res.data}`);
+          message.success("优秀学员称号授予成功");
+
+          getStu();
+        })
+        .catch((err) => {
+          console.log(`优秀学员授予成功${err}`);
+          message.warning("优秀学员称号授予失败");
+        });
+      state.changeGoods = [];
+      state.canclestu = false;
+    };
+    //点击取消授予优秀学员后
+    const cancelyou = () => {
+      state.changeGoods = [];
       state.canclestu = false;
     };
     const showModal3 = () => {
       state.canclestu1 = true;
     };
+    //点击确定取消优秀学员称号
     const closeModal3 = () => {
+      let obj = {
+        projectId: state.projectId,
+        studentIds: state.changeGoods,
+        topFlag: 0,
+      };
+      topStudent(obj)
+        .then((res) => {
+          console.log(`取消优秀学员称号成功${res}`);
+          message.success("优秀学员称号取消成功");
+
+          getStu();
+        })
+        .catch((err) => {
+          console.log(`取消优秀学员称号失败${err}`);
+          message.warning("优秀学员称号取消失败");
+        });
+      state.changeGoods = [];
+      state.canclestu1 = false;
+    };
+    //点击取消取消授予优秀学员后
+    const cancelcanyou = () => {
+      state.changeGoods = [];
       state.canclestu1 = false;
     };
 
@@ -2192,8 +2271,7 @@ export default {
       state.FaceVisivle = true;
     };
     const showSubset = () => {
-      //面授管理的抽屉
-      // console.log("点击管理");
+      // 随机分组
       state.subsetVisivle = true;
     };
     //面授学员的弹窗
@@ -2201,8 +2279,10 @@ export default {
       state.FSvisible = true;
     };
     //面授学员的弹窗
-    const showMemberList = () => {
+    const showMemberList = (id) => {
       state.Lvisible = true;
+      console.log("ssdsdsdsd", id);
+      state.chooseGroupId = id;
     };
     //活动考勤的抽屉
     const showAA = (course) => {
@@ -2283,8 +2363,12 @@ export default {
               onClick={() => {
                 if (value.excellent === false) {
                   state.canclestu = true;
+                  console.log("youxiu", value.studentId);
+                  state.changeGoods.push(value.studentId);
                 } else if (value.excellent === true) {
                   state.canclestu1 = true;
+                  console.log("youxiu", value.studentId);
+                  state.changeGoods.push(value.studentId);
                 }
               }}
             >
@@ -2334,7 +2418,7 @@ export default {
       });
       state.tabledata = arr;
     };
-    // studentData();
+    studentData();
     const studentColumns = () => {
       const tablecolumns = [
         {
@@ -2522,6 +2606,7 @@ export default {
     //点击取消删除单个学员
     const closeDeleteOne = () => {
       state.deleteOneStu = false;
+      state.chooseDeleteOne = [];
     };
     //点击确认删除单个学员
     const closeDeleteOneConfirm = () => {
@@ -2563,6 +2648,7 @@ export default {
         .then((res) => {
           console.log(res, "删除成功");
           message.success("删除成功");
+          state.selectedRows = [];
           getStu();
         })
         .catch((err) => {
@@ -2606,7 +2692,7 @@ export default {
               : value.source == 3
               ? "受众添加"
               : "-", //加入方式
-          beginStudyTime: value.beginStudyTime, //开始学习时间
+          stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
         };
         array.push(obj);
       });
@@ -2638,7 +2724,7 @@ export default {
         deptIds: [], //部门
         groupName: state.valuestugroup,
         name: state.valuestun,
-        pageNo: 1,
+        pageNo: state.currentPageStu,
         pageSize: 10,
         projectId: state.projectId,
         topFlag:
@@ -2646,19 +2732,12 @@ export default {
             ? 1
             : state.valuegood == "普通学员"
             ? 0
-            : null,
+            : state.valuegood == "全部"
+            ? ""
+            : "",
       };
       //重新获取列表
       getStu(obj);
-      // getProjStu(obj).then((res) => {
-      //   console.log("搜索成功", res);
-      //重新获取列表
-      // let leng = res.data.data.rows;
-      // if (leng > 0) {
-      //   let arr = res.data.data.rows;
-      //   getTableDataList(arr);
-      // }
-      // });
     };
     //勾选学员
     const onSelectChange = (selectedRowKeys, selectedRows) => {
@@ -2702,10 +2781,10 @@ export default {
         deptIds: [], //部门
         groupName: "",
         name: "",
-        pageNo: 1,
+        pageNo: state.currentPageStu,
         pageSize: 10,
         projectId: state.projectId,
-        topFlag: 0,
+        topFlag: "",
       };
       getProjStu(objf).then((res) => {
         console.log(res.data.data, "获取学员列表");
@@ -2770,7 +2849,7 @@ export default {
     const getGroup = (obj) => {
       let objf = obj || {
         name: "",
-        pageNo: 1,
+        pageNo: state.currentPageStu,
         pageSize: 10,
         projectId: state.projectId,
       };
@@ -2832,6 +2911,11 @@ export default {
       };
       getGroup(obj);
     };
+    //分页
+    const changePaginationStu = (page) => {
+      state.currentPageStu = page;
+      getStu();
+    };
     //end---------学员------
     onMounted(() => {
       getStu();
@@ -2909,6 +2993,10 @@ export default {
       createG,
       resetGroupName,
       searchGroup,
+      studentData,
+      cancelyou,
+      cancelcanyou,
+      changePaginationStu,
     };
   },
 };

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 28/90] =?UTF-8?q?feaet:=E6=8A=95=E7=A5=A8=E9=A2=98?=
 =?UTF-8?q?=E5=B9=B2=E5=88=A0=E9=99=A4=E3=80=81=E9=80=89=E9=A1=B9=E5=88=A0?=
 =?UTF-8?q?=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 29/90] =?UTF-8?q?style:=E6=8A=95=E7=A5=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=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 30/90] =?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 31/90] =?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 32/90] =?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";

From bc6a15bbf575c2d60627fb7a1f20a7758b8c7c22 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Mon, 14 Nov 2022 11:24:48 +0800
Subject: [PATCH 33/90] =?UTF-8?q?feat=EF=BC=9A=E9=A1=B9=E7=9B=AE=E6=A6=82?=
 =?UTF-8?q?=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js              |   5 +-
 src/views/projectcenter/TaskPage.vue | 649 +++++++++++++++++++++++++--
 2 files changed, 619 insertions(+), 35 deletions(-)

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 28d77063..392664b7 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -19,4 +19,7 @@ export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
 export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
 
 //是否优秀学员
-export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
\ No newline at end of file
+export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
+
+//项目概览
+export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index b1f03ad5..f3538b06 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -50,7 +50,7 @@
         <a-tab-pane key="1" tab="概览">
           <div class="split"></div>
           <!-- 概览（无数据） -->
-          <div>
+          <div style="display: none">
             <div class="onerow">
               <div class="taskmain">快速创建项目详情</div>
             </div>
@@ -116,51 +116,72 @@
           </div>
           <!-- 概览（无数据） -->
           <!-- 概览（有数据） -->
-          <div style="display: none">
+          <div>
             <div class="onerow">
               <div class="taskmain">项目概览</div>
             </div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
-                <span class="nub1">200</span>
+                <span class="nub1">{{
+                  projectInfoOverview.totalStudentCnt
+                }}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #ff90ae">15</span>
-                <div class="nub2">必修课</div>
+                <span class="nub1" style="color: #ff90ae">{{
+                  projectInfoOverview.studyStudentCnt
+                }}</span>
+                <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #a497ff">15</span>
-                <div class="nub2">选修课</div>
+                <span class="nub1" style="color: #a497ff">{{
+                  projectInfoOverview.completeStudentCnt
+                }}</span>
+                <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #5dc988">50</span
+                  <span class="nub1" style="color: #5dc988">{{
+                    projectInfoOverview.onlineCourseCnt
+                  }}</span
                   ><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">完成率</div>
+                <div class="nub2">在线课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #ff90ae">30</span
+                  <span class="nub1" style="color: #ff90ae">{{
+                    projectInfoOverview.offLineCourseCnt
+                  }}</span
                   ><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">必修完成率</div>
+                <div class="nub2">面授课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #a497ff">30</span
+                  <span class="nub1" style="color: #a497ff">{{
+                    projectInfoOverview.completeRatio
+                  }}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
-                <div class="nub2">选修完成率</div>
+                <div class="nub2">总完成率</div>
               </div>
             </div>
             <div class="onerow">
               <div class="taskmain">阶段信息</div>
             </div>
-            <div class="stagemess">
+            <!-- <div class="stagemess">
               <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div>
+            </div> -->
+            <div class="stagemess">
+              <div v-for="item in stageList" 
+              :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
+              :key="item.stageId" @click="choosedStageId = item.stageId">
+              {{item.stage}}
+            </div>
+              <!-- <div class="stage1">阶段1</div>
+              <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
               <div class="staname">阶段名称：</div>
@@ -171,7 +192,7 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="stageOverviewList.completeCourseRatio"
                   :width="140"
                 />
                 <div class="protext">课程完成率</div>
@@ -180,7 +201,7 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="stageOverviewList.completeExamRatio"
                   :width="140"
                 />
                 <div class="protext">考试通过率</div>
@@ -189,26 +210,26 @@
                 <a-progress
                   type="dashboard"
                   gapDegree="0"
-                  :percent="50"
+                  :percent="stageOverviewList.completeRatio"
                   :width="140"
                 />
-                <div class="protext">作业合格率</div>
+                <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
-                <div class="pronub" style="margin-left: 280px">10</div>
+                <div class="pronub" style="margin-left: 280px">{{stageOverviewList.totalTaskCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>
-                  <a-progress :percent="50" style="width: 369px" />
+                  <a-progress :percent="stageOverviewList.totalTaskCnt" style="width: 369px" />
                 </div>
-                <div class="pronub" style="margin-left: 206px">5</div>
+                <div class="pronub" style="margin-left: 206px">{{stageOverviewList.totalReqCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress :percent="25" style="width: 369px" />
+                  <a-progress :percent="stageOverviewList.totalReqCnt" style="width: 369px" />
                 </div>
-                <div class="pronub" style="margin-left: 142px">1</div>
+                <div class="pronub" style="margin-left: 142px">{{stageOverviewList.totalOptCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress :percent="5" style="width: 369px" />
+                  <a-progress :percent="stageOverviewList.totalOptCnt" style="width: 369px" />
                 </div>
               </div>
             </div>
@@ -696,10 +717,12 @@
         <a-tab-pane key="4" tab="公告">
           <div class="split"></div>
           <a-tabs v-model:activeKey="activeKeyNotice">
-            <a-tab-pane key="11" tab="公告"><NoticePub v-model:projectId="projectId"></NoticePub></a-tab-pane>
+            <a-tab-pane key="11" tab="公告"
+              ><NoticePub v-model:projectId="projectId"></NoticePub
+            ></a-tab-pane>
             <a-tab-pane key="12" tab="历史公告" force-render
-              ><NoticeHis  v-model:projectId="projectId"></NoticeHis></a-tab-pane
-            >
+              ><NoticeHis v-model:projectId="projectId"></NoticeHis
+            ></a-tab-pane>
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
@@ -834,15 +857,21 @@
         </a-tab-pane>
         <a-tab-pane key="7" tab="设置">
           <div class="split"></div>
-          <div class="content7">
-            <div class="set_tit">
+          
+          <a-tabs v-model:activeKey="activeSetKey">
+          <a-tab-pane key="12" tab="基本信息">
+            <div class="content7">
+            <!-- <div class="set_tit">
               <span>基本信息</span>
-            </div>
-            <!-- <hr color="#E8E8E8" />
-             -->
-            <div class="line"></div>
+            </div> -->
+            
+            <!-- <div class="line"></div> -->
             <div class="set_body">
-              <div class="edit" @click="showEditProj">
+              <!-- <div class="edit" @click="showEditProj">
+                <div class="img"></div>
+                <div class="ed">编辑</div>
+              </div> -->
+               <div class="edit">
                 <div class="img"></div>
                 <div class="ed">编辑</div>
               </div>
@@ -920,6 +949,49 @@
               </div>
             </div>
           </div>
+          </a-tab-pane>
+          <a-tab-pane key="13" tab="共享文档">
+            <div class="sametab">
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">上传共享文档</div>
+                    <div class="oneedi">
+                      <a-switch v-model:checked="docChecked" ></a-switch>
+                    </div>
+                  </div>
+                  <div class="btnbox" style="margin:20px;">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
+                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
+                  width:34px;height:34px;
+                  " alt="">
+                </a-upload>
+                <div class="btnbox" style="margin:20px;">
+                <span style="color: #999999">
+                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                </span>
+              </div>
+              <div v-for="item in docList" :key="item.src" class="docListStyle">
+                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
+                  width:40px;height:40px;margin-right:40px;
+                  " alt="">
+                <span style="font: oblique bold  16px Sans-serif">{{item.name}}</span> 
+                <span style="color: #4ea6ff;float:right;">删除</span>
+              </div>
+              </div>
+                </div>
+              </div>
+            </div>
+          </a-tab-pane>
+          </a-tabs>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -1415,6 +1487,7 @@ import * as apitl from "../../api/index";
 import { getTask } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
+import { overview } from "../../api/indexProjStu";
 export default {
   name: "taskPage",
   components: {
@@ -1467,6 +1540,23 @@ export default {
         },
       ],
       changeGoods: [], //更改是否优秀的id数组
+      choosedStageId:1, // 选择的阶段id
+      activeSetKey:"12",//12-基础信息 13-共享文档
+      docChecked:true,
+      docList:[
+        {
+          name:'测试文档1.doc',
+          src:"",
+        },
+        {
+          name:'测试文档2.doc',
+          src:"",
+        },
+        {
+          name:'测试文档3.doc',
+          src:"",
+        }
+      ],
       //学员信息列表
       tabledata: [
         // {
@@ -2034,6 +2124,37 @@ export default {
       picUrl: null,
     });
 
+    const levelList = reactive({
+      projectInfoOverview: {
+        // 整体数据概览
+        totalStudentCnt: 0,
+        studyStudentCnt: 0,
+        completeStudentCnt: 0,
+        onlineCourseCnt: 0,
+        offLineCourseCnt: 0,
+        completeRatio: 0,
+      },
+      stageOverviewList: {
+        // 阶段数据概览
+        completeCourseRatio: 0,
+        completeExamRatio: 0,
+        completeRatio: 0,
+        totalTaskCnt: 0,
+        totalReqCnt: 0,
+        totalOptCnt: 0,
+      },
+      stageList: [
+        // 阶段列表
+        {
+          stageId: 1,
+          stage: "阶段一",
+        },
+        {
+          stageId: 2,
+          stage: "阶段二",
+        },
+      ],
+    });
     // 输入接入 -- start --
 
     const router = useRoute();
@@ -2911,14 +3032,55 @@ export default {
       getStu();
     };
     //end---------学员------
+
+    //start---------项目概览
+    // 获取项目概览
+    const getOverview = () => {
+      overview({projectId:state.projectId})
+        .then((res) => {
+          Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
+            levelList.projectInfoOverview[item] =
+              res.data.data.projectInfoOverview[item] || 0;
+          });
+          Object.keys(res.data.data.stageOverviewList).forEach((item) => {
+            levelList.stageOverviewList[item] =
+              res.data.data.stageOverviewList[item] || 0;
+          });
+          // res.data.data.routerInfoOverview.forEach((r) => {
+          //   console.log(r)
+          // })
+          // state.addLoading = false;
+          console.log("项目概览--" + res);
+        })
+        .catch((err) => {
+          // state.addLoading = false;
+          message.error("概览获取失败");
+          console.log("获取失败" + err);
+        });
+    };
+    //end---------项目概览
+
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
+        console.log(info.file, info.fileList);
+      }
+
+      if (info.file.status === "done") {
+        message.success(`${info.file.name} 文件上传成功`);
+      } else if (info.file.status === "error") {
+        message.error(`${info.file.name} 文件上传失败.`);
+      }
+    };
     onMounted(() => {
       getStu();
       getTaskList();
       getTaskInfo();
       getGroup();
+      getOverview();
     });
     return {
       ...toRefs(state),
+      ...toRefs(levelList),
       totask,
       tostudent,
       showModal,
@@ -2991,6 +3153,7 @@ export default {
       cancelyou,
       cancelcanyou,
       changePaginationStu,
+      handleChange,
     };
   },
 };
@@ -5085,6 +5248,7 @@ export default {
     }
   }
 
+  //设置的基本信息
   .content7 {
     margin-top: 20px;
 
@@ -5152,6 +5316,423 @@ export default {
       }
     }
   }
+  //设置的共享文档
+  .sametab {
+      // margin-left: 30px;
+      // margin-right: 30px;
+      margin-top: 30px;
+      width: 100%;
+      // background-color: green;
+      .Gcon {
+      display: flex;
+      .pad {
+        height: 100%;
+        width: 40px;
+      }
+      .Gin {
+        // background-color: #bfa;
+        margin-top: 30px;
+        .headone {
+          // background-color: red;
+          display: flex;
+          text-align: center;
+          .box {
+            width: 4px;
+            height: 20px;
+            background-color: #409eff;
+            border-radius: 2px;
+          }
+          .onetitle {
+            margin-left: 15px;
+            color: #333333;
+            font-size: 14px;
+          }
+          .oneedi {
+            margin-left: 15px;
+            color: #4ea6ff;
+            cursor: pointer;
+          }
+          .twobtn {
+            display: flex;
+            .btnone {
+              width: 42px;
+              height: 24px;
+              border: 1px solid rgba(64, 158, 255, 1);
+              border-radius: 4px;
+              color: rgba(64, 158, 255, 1);
+              margin-left: 20px;
+              cursor: pointer;
+            }
+            .btntwo {
+              width: 42px;
+              height: 24px;
+              border: 1px solid rgba(64, 158, 255, 1);
+              border-radius: 4px;
+              color: #ffffff;
+              margin-left: 20px;
+              background: #409eff;
+              cursor: pointer;
+            }
+          }
+        }
+        .onemain {
+          margin-top: 20px;
+          margin-left: 55px;
+          color: #6f6f6f;
+          font-size: 14px;
+          .checkcon {
+            position: relative;
+            .in {
+              position: absolute;
+              // margin-top: 10px;
+              left: 0;
+              top: 3px;
+            }
+            .yulan {
+              // color: yellow;
+              margin-left: 22px;
+              // display: inline-block;
+            }
+            .yulan2 {
+              margin-left: 22px;
+            }
+            .ant-input-number {
+              height: 24px;
+              width: 24px;
+              margin: 10px;
+              border-radius: 4px;
+              border: 1px solid #6d7584;
+              .ant-input-number-input {
+                width: 100%;
+                height: 100%;
+                font-size: 14px;
+                padding: 0;
+                color: #409eff;
+                text-align: center;
+              }
+            }
+          }
+        }
+        .twomain {
+          margin-left: 20px;
+          margin-top: 20px;
+          .ant-switch-checked {
+            background-color: #5dc988;
+          }
+          .info {
+            margin-left: 10px;
+            color: #6f6f6f;
+            font-size: 14px;
+            // margin-top: 10px;
+          }
+          .infor {
+            margin-left: 38px;
+            margin-top: 10px;
+            color: #c7cbd2;
+            font-size: 14px;
+          }
+          .chooseshow {
+            // background-color: red;
+            margin-left: 38px;
+            margin-top: 12px;
+            .fane {
+              color: #6f6f6f;
+              font-size: 14px;
+            }
+          }
+          .choo {
+            display: none;
+          }
+          .btm {
+            margin-left: 38px;
+            margin-top: 20px;
+            .bmo {
+              color: #6f6f6f;
+              font-size: 14px;
+            }
+            .bmt {
+              color: #c7cbd2;
+              font-size: 14px;
+              margin-top: 3px;
+            }
+            .chosecon {
+              display: flex;
+              margin-top: 6px;
+              margin-bottom: 20px;
+              .chose {
+                position: relative;
+                .inl {
+                  position: absolute;
+                  top: 2px;
+                }
+                .sh {
+                  margin-left: 23px;
+                  color: #6f6f6f;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+      .Lhead {
+        display: flex;
+        .btns {
+          display: flex;
+          margin-left: 20px;
+          // flex-wrap: wrap;
+          .btn {
+            padding: 0px 26px 0px 26px;
+            height: 38px;
+            background: rgba(64, 158, 255, 0);
+            border-radius: 8px;
+            border: 1px solid rgba(64, 158, 255, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 14px;
+            flex-shrink: 0;
+            cursor: pointer;
+            .search {
+              background-size: 100%;
+            }
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: rgba(64, 158, 255, 1);
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+          .btn1 {
+            .search {
+              width: 15px;
+              height: 17px;
+              background-image: url("../../assets/images/courseManage/search1.png");
+            }
+          }
+          .btn2 {
+            .search {
+              width: 16px;
+              height: 18px;
+              background-image: url("../../assets/images/courseManage/reset1.png");
+            }
+          }
+          .btn3 {
+            margin-right: 0px;
+            .search {
+              width: 17px;
+              height: 18px;
+              background-image: url("../../assets/images/courseManage/add1.png");
+            }
+          }
+          .btn1:hover {
+            background: rgba(64, 158, 255, 1);
+            .search {
+              background-image: url("../../assets/images/courseManage/search0.png");
+            }
+            .btnText {
+              color: #ffffff;
+            }
+          }
+          .btn2:hover {
+            background: rgba(64, 158, 255, 1);
+            .search {
+              background-image: url("../../assets/images/courseManage/reset0.png");
+            }
+            .btnText {
+              color: #ffffff;
+            }
+          }
+          .btn3:hover {
+            background: rgba(64, 158, 255, 1);
+            .search {
+              background-image: url("../../assets/images/courseManage/add0.png");
+            }
+            .btnText {
+              color: #ffffff;
+            }
+          }
+        }
+      }
+      .Lbom {
+        position: relative;
+        margin-bottom: 20px;
+        .item {
+          width: 100%;
+          height: 200px;
+          // background-color: green;
+          margin-top: 40px;
+          border-radius: 8px;
+          border: 1px solid #f0f4fe;
+          .itemhead {
+            height: 50px;
+            width: 100%;
+            background-color: #f0f4fe;
+            display: flex;
+            align-items: center;
+            position: relative;
+            .lev {
+              margin-left: 27px;
+              margin-right: 16px;
+              line-height: 100%;
+              color: #409eff;
+              font-size: 16px;
+            }
+            .lin {
+              width: 1px;
+              height: 35%;
+              background-color: #c7cbd2;
+            }
+            .nam {
+              margin-left: 16px;
+              color: #4f5156;
+              line-height: 100%;
+              font-size: 16px;
+            }
+            .count {
+              position: absolute;
+              line-height: 100%;
+              color: #4f5156;
+              font-size: 14px;
+              right: 40px;
+              span:nth-child(2) {
+                color: #63ca8c;
+              }
+            }
+          }
+          .itembomm {
+            display: flex;
+            align-items: center;
+            height: 150px;
+            .it {
+              // margin-left: 110px;
+              // margin-right: 110px;
+              width: 13%;
+              text-align: center;
+              .on {
+                font-size: 30px;
+              }
+              .ittext {
+                color: #4f5156;
+                margin-top: 16px;
+                margin-left: -5px;
+              }
+            }
+            .linee {
+              background-color: #ecf2fb;
+              width: 1px;
+              height: 55%;
+            }
+            .itright {
+              position: absolute;
+              right: 45px;
+              display: flex;
+              .te {
+                color: #4ea6ff;
+                font-size: 14px;
+                cursor: pointer;
+              }
+              .more {
+                position: relative;
+                height: 30px;
+                display: flex;
+                .moreArrow {
+                  width: 13px;
+                  height: 7px;
+                  display: inline-block;
+                  background-image: url("../../assets/images/navtop/down.png");
+                  background-size: 100%;
+                  margin: 2px;
+                  margin-left: 7px;
+                  margin-top: 6px;
+                }
+                .moreItems {
+                  width: 80px;
+                  height: 70px;
+                  display: none;
+                  background: #ffffff;
+                  box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
+                  border-radius: 3px;
+                  border: 0px solid #dcdcdc;
+                  position: absolute;
+                  left: 0px;
+                  top: 20px;
+                  z-index: 100;
+                  .roleItem {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: rgba(79, 81, 86, 1);
+                    line-height: 36px;
+                    display: flex;
+                    justify-content: center;
+                    cursor: pointer;
+                  }
+                  .roleItem:hover {
+                    color: #4ea6ff;
+                  }
+                }
+              }
+              .more:hover .moreArrow {
+                background-image: url("../../assets/images/navtop/up.png");
+              }
+              .more:hover .moreItems {
+                display: block;
+              }
+            }
+          }
+
+          .show {
+            color: blue;
+          }
+          .noshow {
+            display: none;
+          }
+        }
+        .create {
+          margin-top: 40px;
+          .taskbox {
+            width: 412px;
+            height: 160px;
+            border-radius: 10px;
+            position: relative;
+            // margin-left: 68px;
+            margin-bottom: 40px;
+            cursor: pointer;
+            .leftt {
+              position: absolute;
+              top: 18px;
+              left: 0;
+            }
+            .photo {
+              position: absolute;
+              top: 42px;
+              left: 37px;
+            }
+            .rightt {
+              position: absolute;
+              top: 69px;
+              right: 26px;
+            }
+            .centerbox {
+              position: absolute;
+              top: 52px;
+              left: 145px;
+              font-size: 20px;
+              font-weight: 700;
+              //line-height: 36px;
+            }
+            .centermain {
+              color: rgba(135, 139, 146, 1);
+              font-size: 14px;
+              position: absolute;
+              left: 144px;
+              bottom: 49px;
+            }
+          }
+        }
+      }
+    }
 }
 
 .DelModal {

From 4b84e2c4295e59ede4d2af4882e8ea7d100dbf34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Mon, 14 Nov 2022 11:48:24 +0800
Subject: [PATCH 34/90] =?UTF-8?q?feat:=20=E5=85=B3=E5=8D=A1=E4=B8=8B=20?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=B7=BB=E5=8A=A0=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=AD=A6=E5=91=98=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=20=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E5=92=8C=E5=85=B1=E4=BA=AB=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                      |    3 +
 src/components/drawers/pathStuAdd.vue  | 1622 ++++++++++++++++++++++++
 src/views/learningpath/LevelAdd.vue    |   45 +-
 src/views/projectcenter/LibraryAdd.vue |   67 +-
 4 files changed, 1721 insertions(+), 16 deletions(-)
 create mode 100644 src/components/drawers/pathStuAdd.vue

diff --git a/src/api/index1.js b/src/api/index1.js
index e21c301b..abe4699f 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -70,6 +70,9 @@ export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
 });
 //添加学员
 export const addStudent = (obj) => http.post('/admin/router/addStudent', obj);
+//删除学员
+export const delStudent = (obj) => http.post('/admin/router/deleteStudent', obj);
+
 
 
 //项目基础信息-----------------------------------
diff --git a/src/components/drawers/pathStuAdd.vue b/src/components/drawers/pathStuAdd.vue
new file mode 100644
index 00000000..9589bdde
--- /dev/null
+++ b/src/components/drawers/pathStuAdd.vue
@@ -0,0 +1,1622 @@
+<template>
+    <a-drawer
+      :visible="Stuvisible"
+      class="drawerStyle stuadd"
+      placement="right"
+      width="70%"
+      @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="main">
+          <div class="left">
+            <div class="tabs">
+              <a-tabs v-model:activeKey="activeKey">
+                <a-tab-pane key="1" tab="快速选人">
+                  <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="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>
+                    <!-- <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="chooseLeft">
+                      <div class="boeTree">
+                        <a-tree-select
+                          v-model:value="valueSelectboe"
+                          style="width: 240px; border-radius: 4px"
+                          dropdownClassName="changetreedropdownboe"
+                          :dropdown-style="{
+                            maxHeight: '600px',
+                            overflow: 'auto',
+                          }"
+                          placeholder="BOE组织树"
+                          allow-clear
+                          tree-default-expand-all
+                          :tree-data="treeData"
+                        >
+                          <template #suffixIcon></template>
+                        </a-tree-select>
+                      </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"
+                          @expand="expandTable"
+                          :pagination="false"
+                          :row-selection="{
+                            columnWidth: 20,
+                            selectedRowKeys: selectedRowKeys,
+                            onChange: onSelectChange,
+                          }"
+                        />
+                        <div class="pa">
+                          <a-pagination
+                            showSizeChanger="true"
+                            showQuickJumper="true"
+                            hideOnSinglePage="true"
+                            :pageSize="pageSize"
+                            :current="currentPage"
+                            :total="tableDataTotal"
+                            class="pagination"
+                          />
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </a-tab-pane>
+                <a-tab-pane key="2" tab="添加组织" force-render>
+                  <div
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                    style="overflow-y: auto"
+                  >
+                    <div class="tab2">
+                      <div class="nameinp">
+                        <div class="namee">组织：</div>
+                        <a-input
+                          v-model:value="com"
+                          style="width: 230px; 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>
+                        <div class="btn2">
+                          <div class="img2">
+                            <img
+                              src="../../assets/images/courseManage/reset1.png"
+                            />
+                          </div>
+                          <div class="wz">重置</div>
+                        </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="boeTree">
+                      <a-tree-select
+                        v-model:value="valueSelectboe2"
+                        style="width: 240px; border-radius: 4px"
+                        dropdownClassName="changetreedropdownboe"
+                        :dropdown-style="{
+                          maxHeight: '600px',
+                          overflow: 'auto',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData2"
+                      >
+                        <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>
+                      </div>
+                    </div> -->
+                  </div>
+                </a-tab-pane>
+                <a-tab-pane key="3" tab="受众关联">
+                  <div
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                    style="overflow-y: auto"
+                  >
+                    <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 }"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 30,
+                          selectedRowKeys: selectedRowKeys2,
+                          onChange: onSelectChange2,
+                        }"
+                      />
+                      <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="onerow">
+              <div class="onleft">
+                <div class="already">已选</div>
+                <div class="count">6</div>
+                <div class="peo">人</div>
+              </div>
+              <div class="clbox">
+                <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>
+            </div>
+            <div class="line"></div>
+            <div class="tit">添加组织</div>
+            <div class="line"></div>
+            <div class="tit">受众关联</div>
+          </div>
+        </div>
+        <div class="btnn">
+          <button class="btn1">取消</button>
+          <button class="btn2">确定</button>
+        </div>
+      </div>
+    </a-drawer>
+  </template>
+  
+  <script>
+  import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+  export default {
+    name: "StuAdd",
+    props: {
+      Stuvisible: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    setup(props, ctx) {
+      const state = reactive({
+        screenHeight: document.body.clientHeight, // 屏幕高度
+        pageSize: 10,
+        currentPage: 1,
+        tableDataTotal: 50,
+        pageSize1: 10,
+        currentPage1: 1,
+        tableDataTotal1: 50,
+        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: "京东方",
+            value: "京东方",
+            children: [
+              {
+                title: "产研部",
+                value: "产研部",
+                children: [
+                  {
+                    title: "产品部",
+                    value: "产品部",
+                  },
+                  {
+                    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: "行政部",
+                    value: "行政部",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        treeData2: [
+          {
+            title: "京东方",
+            value: "京东方",
+            children: [
+              {
+                title: "产研部",
+                value: "产研部",
+                children: [
+                  {
+                    title: "产品部",
+                    value: "产品部",
+                  },
+                  {
+                    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: "行政部",
+                    value: "行政部",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+        tabledata: [
+          {
+            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: "产品部",
+          },
+        ],
+        tablecolumns: [
+          {
+            title: "姓名",
+            dataIndex: "name",
+            key: "name",
+            // width: 30,
+            align: "left",
+            className: "h",
+          },
+          {
+            title: "工号",
+            dataIndex: "numb",
+            key: "numb",
+            // width: 30,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "归属组织",
+            dataIndex: "guishu",
+            key: "guishu",
+            // width: 30,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "部门",
+            dataIndex: "bum",
+            key: "bum",
+            // 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",
+          },
+        ],
+        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: "李明",
+          },
+        ],
+      });
+      const closeDrawer = () => {
+        state.activeKey = "1";
+        ctx.emit("update:Stuvisible", false);
+      };
+  
+      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 = () => {
+        state.screenHeight = document.body.clientHeight;
+      };
+  
+      onMounted(() => {
+        // console.log("11111", 1);
+        window.addEventListener("resize", getMousePosition, false);
+        // judgeUrl();
+      });
+      onUnmounted(() => {
+        window.removeEventListener("resize", getMousePosition, false);
+      });
+      return {
+        ...toRefs(state),
+        afterVisibleChange,
+        closeDrawer,
+        onSelectChange,
+        onSelectChange1,
+        onSelectChange2,
+        // change,
+      };
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .stuadd {
+    .drawerMain {
+      min-width: 600px;
+      margin: 0px 32px 0px 32px;
+      // overflow-y: auto;
+      display: flex;
+      flex-direction: column;
+  
+      .header {
+        height: 73px;
+        border-bottom: 1px solid #e8e8e8;
+        display: flex;
+        flex-shrink: 0;
+        justify-content: space-between;
+        align-items: center;
+        // background-color: red;
+        margin-bottom: 20px;
+        .headerTitle {
+          font-size: 18px;
+          font-weight: 600;
+          color: #333333;
+          line-height: 25px;
+          // margin-left: 24px;
+        }
+      }
+      .main {
+        display: flex;
+        //height: 80%;
+        margin-bottom: 72px;
+        overflow-y: auto;
+        .left {
+          // overflow-y: auto;
+          width: 65%;
+          // height: 100%;
+          border-right: 1px solid rgba(233, 233, 233, 1);
+          .tabs {
+            margin-right: 33px;
+  
+            .tab1 {
+              display: flex;
+              flex-wrap: wrap;
+              justify-content: space-between;
+              align-items: center;
+              .t1 {
+                display: flex;
+                align-items: center;
+                margin-bottom: 5px;
+              }
+              .nameinp {
+                display: flex;
+                align-items: center;
+                margin-top: 10px;
+                .namee {
+                  color: rgba(0, 0, 0, 0.85);
+                  font-size: 14px;
+                }
+              }
+              .btns {
+                display: flex;
+                margin-top: 10px;
+                .btn1 {
+                  width: 100px;
+                  height: 40px;
+                  margin-right: 16px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  color: #ffffff;
+                  font-size: 14px;
+                  background: #409eff;
+                  border-radius: 8px;
+                  border: 1px solid #409eff;
+                  cursor: pointer;
+                  .wz {
+                    margin-left: 10px;
+                  }
+                }
+                .btn2 {
+                  width: 100px;
+                  height: 40px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  color: #409eff;
+                  font-size: 14px;
+                  background: #ffffff;
+                  border-radius: 8px;
+                  cursor: pointer;
+                  border: 1px solid #409eff;
+                  .wz {
+                    margin-left: 10px;
+                  }
+                }
+              }
+            }
+            .btns {
+              display: flex;
+              margin-top: 10px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+            .line {
+              width: 100%;
+              height: 40px;
+              background-color: #e9f6fe;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              margin-top: 20px;
+              border: 1px solid #c3e6fc;
+  
+              .inline {
+                width: 95%;
+                height: 100%;
+                display: flex;
+                justify-content: space-between;
+  
+                // background-color: #bfa;
+                .left1 {
+                  height: 100%;
+                  display: flex;
+                  align-items: center;
+  
+                  .img {
+                    width: 14px;
+                    height: 15px;
+                    background-image: url(../../assets/images/leveladd/gan.png);
+                    background-size: 100% 100%;
+                  }
+  
+                  .text {
+                    color: #999ba3;
+                  }
+  
+                  .text2 {
+                    color: #4ea6ff;
+                    margin-left: 5px;
+                    margin-right: 5px;
+                  }
+  
+                  .text3 {
+                    color: #999ba3;
+                    margin-left: 20px;
+                  }
+                }
+  
+                .right1 {
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #387df7;
+                  height: 100%;
+                  display: flex;
+                  align-items: center;
+                  cursor: pointer;
+                }
+              }
+            }
+            .chooseLeft {
+              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;
+                    }
+                  }
+                }
+              }
+              .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;
+                  }
+                }
+              }
+            }
+  
+            .tab2 {
+              display: flex;
+              align-items: center;
+              // margin-top: 10px;
+              flex-wrap: wrap;
+              justify-content: space-between;
+              .nameinp {
+                display: flex;
+                align-items: center;
+                margin-top: 10px;
+                .namee {
+                  color: rgba(0, 0, 0, 0.85);
+                  font-size: 14px;
+                }
+              }
+  
+              .t1 {
+                display: flex;
+                align-items: center;
+                margin-bottom: 5px;
+              }
+              .btns {
+                display: flex;
+                // margin-top: -10px;
+                .btn1 {
+                  width: 100px;
+                  height: 40px;
+                  margin-right: 16px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  color: #ffffff;
+                  font-size: 14px;
+                  background: #409eff;
+                  border-radius: 8px;
+                  border: 1px solid #409eff;
+                  cursor: pointer;
+                  .wz {
+                    margin-left: 10px;
+                  }
+                }
+                .btn2 {
+                  width: 100px;
+                  height: 40px;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  color: #409eff;
+                  font-size: 14px;
+                  background: #ffffff;
+                  border-radius: 8px;
+                  cursor: pointer;
+                  border: 1px solid #409eff;
+                  .wz {
+                    margin-left: 10px;
+                  }
+                }
+              }
+              .organize {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+                white-space: nowrap;
+              }
+  
+              .ant-select-dropdown {
+                min-width: 800px !important;
+              }
+              .ant-select {
+                border-radius: 8px !important;
+                // background-color: red;
+              }
+              .ant-cascader {
+                width: 264px;
+                height: 40px;
+                border-radius: 8px !important;
+                .ant-select-selector {
+                  height: 100%;
+                }
+                .ant-select-selection-search-input {
+                  height: 40px;
+                }
+              }
+            }
+            .boeTree {
+              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;
+                  }
+                }
+              }
+            }
+          }
+        }
+        .right {
+          width: 35%;
+          .onerow {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-right: 40px;
+            flex-wrap: wrap;
+            .onleft {
+              display: flex;
+              text-align: center;
+              .already {
+                color: rgba(51, 51, 51, 1);
+                font-size: 16px;
+                font-weight: 500;
+                margin-left: 32px;
+                white-space: nowrap;
+                // margin-bottom: 20px;
+              }
+              .count {
+                color: #388be1;
+                font-size: 16px;
+                margin: 0 6px;
+              }
+              .peo {
+                color: rgba(51, 51, 51, 1);
+                font-size: 16px;
+                font-weight: 500;
+              }
+            }
+            .clbox {
+              margin-left: 30px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              cursor: pointer;
+              width: 104px;
+              height: 32px;
+              border-radius: 4px;
+              background: #409eff;
+              .colose {
+                width: 16px;
+                height: 16px;
+                // border-radius: 8px;
+                // background: #ffffff;
+                // position: relative;
+                background-image: url(../../assets/images/basicinfo/ch.png);
+                background-size: 100%;
+                margin-right: 4px;
+              }
+              .allclear {
+                color: rgba(255, 255, 255, 1);
+                font-size: 14px;
+              }
+            }
+          }
+          .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;
+          }
+          .selecteds {
+            display: flex;
+            flex-wrap: wrap;
+            margin-left: 32px;
+            height: 200px;
+            overflow-y: hidden;
+            .chose {
+              width: 64px;
+              height: 24px;
+              margin-top: 25px;
+              margin-right: 25px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 2px;
+              border: 1px solid rgba(56, 139, 225, 1);
+              color: rgba(56, 139, 225, 1);
+              font-size: 12px;
+              position: relative;
+              .ch {
+                position: absolute;
+                width: 18px;
+                height: 18px;
+                background-image: url(../../assets/images/basicinfo/ch.png);
+                right: -8px;
+                top: -8px;
+              }
+            }
+          }
+        }
+      }
+      .btnn {
+        height: 72px;
+        width: 100%;
+        position: absolute;
+        background-color: #fff;
+        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: #409eff;
+          border-radius: 8px;
+          border: 0;
+          margin-left: 15px;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .changetreedropdown {
+    width: 500px !important;
+    .ant-select-tree-list-scrollbar {
+      width: 5px !important;
+      .ant-select-tree-list-scrollbar-thumb {
+        background-color: #4ea6ff !important;
+      }
+    }
+    .ant-select-tree-indent-unit {
+      width: 7px !important;
+    }
+  }
+  .changetreedropdownboe {
+    width: 240px !important;
+    border-radius: 5px;
+    min-height: 600px !important;
+    .ant-select-tree-list-scrollbar {
+      width: 5px !important;
+      .ant-select-tree-list-scrollbar-thumb {
+        background-color: #4ea6ff !important;
+      }
+    }
+    .ant-select-tree-indent-unit {
+      width: 7px !important;
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 8948c276..b0cef46f 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -749,7 +749,7 @@
                 <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
                   width:40px;height:40px;margin-right:40px;
                   " alt="">
-                <span style="font: oblique bold  16px Sans-serif">{{item.name}}</span> 
+                <span style="font: oblique   16px Sans-serif">{{item.name}}</span> 
                 <span style="color: #4ea6ff;float:right;">删除</span>
               </div>
               </div>
@@ -915,7 +915,7 @@
         </div>
       </a-modal>
       <!-- 添加学员抽屉 -->
-      <add-stu v-model:AddSvisible="AddSvisible" />
+      <path-add-stu v-model:Stuvisible="Stuvisible" />
       <!-- 导入学员抽屉 -->
       <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
       <!-- 学员管理查看抽屉 -->
@@ -945,7 +945,7 @@
 <script>
 import { ref, reactive, toRefs,onMounted } from "vue";
 import { message } from "ant-design-vue";
-import AddStu from "../../components/drawers/AddLevelAddStu";
+import PathAddStu from "../../components/drawers/pathStuAdd";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import CheckStu from "../../components/drawers/CheckStu";
 import FaceStu from "../../components/drawers/FaceStu";
@@ -956,16 +956,15 @@ import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
 // import { useRoute } from "vue-router";
 // import { useStore } from "vuex";
-import * as api from "../../api/index1";
 import { storage } from "../../api/storage";
-
 import { getRouterOverview } from "@/api/indexLearningPath";
 import { GetRouterDetail } from "@/api/indexTask";
+import * as api from "../../api/index1";
 
 export default {
   name: "LevelAdd",
   components: {
-    AddStu,
+    PathAddStu,
     ImpStu,
     CheckStu,
     FaceStu,
@@ -984,7 +983,7 @@ export default {
       gatename: null, //关卡名称
       gatenamee: null, //学员管理关卡名称
       deleteAll: false, //批量删除学员弹窗
-      AddSvisible: false, //添加学员抽屉
+      Stuvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
       CheckStuvisible: false, //学员管理的查看抽屉
       addLoading:false, // 加载动画
@@ -994,6 +993,7 @@ export default {
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      // 共享文档列表
       docList:[
         {
           name:'测试文档1.doc',
@@ -1007,7 +1007,7 @@ export default {
           name:'测试文档3.doc',
           src:"",
         }
-      ], // 共享文档列表
+      ], 
       huodModal: false,
       zhibModal: false,
       projectNameListt: [
@@ -1377,7 +1377,9 @@ export default {
                   >
                     调整
                   </span>
-                  <span style="color:#4EA6FF;cursor:pointer">删除</span>
+                  <span style="color:#4EA6FF;cursor:pointer"
+                  onClick={() => {myDelStudent}}
+                  >删除</span>
                 </div>
               </div>
             );
@@ -1403,7 +1405,7 @@ export default {
       state.visiblene = false;
     };
     const showAddStu = () => {
-      state.AddSvisible = true;
+      state.Stuvisible = true;
     };
     const showImpStu = () => {
       state.AddImpStuvisible = true;
@@ -1488,9 +1490,10 @@ export default {
     //获取学员列表
     const getStudent = () => {
       let obj = {
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
         routerId: state.routerId,
-        pageNo: 1,
-        pageSize: 10,
       };
       api
         .getStudent(obj)
@@ -1501,8 +1504,19 @@ export default {
           console.log("获取学员列表失败", err);
         });
     };
-
-    
+    const myDelStudent = () => {
+      let obj = {
+        "routerId": 0,
+        "studentIds": []
+      };
+      api.methods(obj).then(res => {
+        message.success("删除成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("删除失败"+err)
+        console.log(err)
+      })
+    }
   const checkType = (type) => {
     let typeRules = [
         "",
@@ -1616,7 +1630,8 @@ export default {
       closezhibModal,
       changeTabs,
       checkType,
-      handleChange
+      handleChange,
+      myDelStudent,
     };
   },
 };
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index c12d426c..eb1b0eb1 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -383,6 +383,8 @@
         </a-tab-pane>
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
+          <a-tabs>
+            <a-tab-pane key="1" tab="编辑">
           <div class="setting">
             <div class="set_tit">
               <span>基本信息</span>
@@ -459,6 +461,49 @@
               </div>
             </div>
           </div>
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="共享文档">
+              <div class="sametab">
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone">
+                    <div class="box"></div>
+                    <div class="onetitle">上传共享文档</div>
+                    <div class="oneedi">
+                      <a-switch v-model:checked="docChecked" ></a-switch>
+                    </div>
+                  </div>
+                  <div class="btnbox" style="margin:20px;">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
+                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
+                  width:34px;height:34px;
+                  " alt="">
+                </a-upload>
+                <div class="btnbox" style="margin:20px;">
+                <span style="color: #999999">
+                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                </span>
+              </div>
+              <div v-for="item in docList" :key="item.src" class="docListStyle">
+                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
+                  width:40px;height:40px;margin-right:40px;
+                  " alt="">
+                <span style="font: oblique   16px Sans-serif">{{item.name}}</span> 
+                <span style="color: #4ea6ff;float:right;">删除</span>
+              </div>
+              </div>
+                </div>
+              </div>
+            </div>
+            </a-tab-pane>
+          </a-tabs>
         </a-tab-pane>
       </a-tabs>
       <a-modal
@@ -639,12 +684,28 @@ export default defineComponent({
       checked: false,
       checked2: false,
       checked3: false,
+      docChecked:true,
       value3: false,
       value4: false,
       hideshow: false,
       score1: 5,
       score2: 5,
       edit: true,
+      // 共享文档列表
+      docList:[
+        {
+          name:'测试文档1.doc',
+          src:"",
+        },
+        {
+          name:'测试文档2.doc',
+          src:"",
+        },
+        {
+          name:'测试文档3.doc',
+          src:"",
+        }
+      ], 
     });
     const value = ref("");
     const value2 = ref("");
@@ -849,7 +910,11 @@ export default defineComponent({
         height: 20px;
         background-color: #edf0f5;
       }
-
+      .docListStyle {
+        display: flex;
+        width: 300px !important;
+        justify-content: space-around;
+      }
     .taskBox {
       .onerow {
         //width: 100%;

From d89dabdafc66cb500b3057a1679f8d9e16df6336 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 14 Nov 2022 16:57:35 +0800
Subject: [PATCH 35/90] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ManageRight.vue | 1886 +++++++++++++++++-------
 src/components/drawers/Ownership.vue   | 1285 +++++++++-------
 src/components/drawers/ProjectOwn.vue  |  110 +-
 src/components/drawers/QueryRight.vue  | 1857 +++++++++++++++++------
 src/components/drawers/StuAdd.vue      |  356 +++--
 5 files changed, 3831 insertions(+), 1663 deletions(-)

diff --git a/src/components/drawers/ManageRight.vue b/src/components/drawers/ManageRight.vue
index 65bdbfc9..438af6a0 100644
--- a/src/components/drawers/ManageRight.vue
+++ b/src/components/drawers/ManageRight.vue
@@ -4,10 +4,10 @@
     :visible="Managevisible"
     class="drawerStyle ManageRight"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="ManageRight">
       <div class="header">
         <div class="headerTitle">管理权</div>
         <img
@@ -21,35 +21,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,158 +66,189 @@
                     <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">
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
                     <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 class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <!-- <template #title="{ title }">
+                        <span v-if="title.indexOf(com) > -1">
+                          {{ title.substr(0, title.indexOf(com)) }}
+                          <span style="color: #f50">{{ com }}</span>
+                          {{ title.substr(title.indexOf(com) + com.length) }}
+                        </span>
+                        <span v-else>{{ title }}</span>
+                      </template> -->
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
                       </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="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -226,24 +261,23 @@
                     <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">
+                  <div class="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -252,6 +286,7 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
+                        v-if="tabledata2 > 10"
                       />
                     </div>
                   </div>
@@ -260,87 +295,201 @@
             </a-tabs>
           </div>
         </div>
-        <!-- <div class="thinLine"></div> -->
         <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 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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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 class="chose">
-              李明
-              <div class="ch"></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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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 class="chose">
-              李二明
-              <div class="ch"></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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <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>
-            <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="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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>
@@ -350,11 +499,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";
+import { toDate } from "../../api/method";
 export default {
   name: "ManageRight",
   props: {
@@ -365,6 +547,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -374,16 +557,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: null,
+      //组织树
       treeData: [
         {
           title: "京东方",
@@ -401,6 +588,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",
+                },
               ],
             },
             {
@@ -446,6 +665,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:
+                                                                                                "二十级标题二十级标题",
+                                                                                            },
+                                                                                          ],
+                                                                                      },
+                                                                                    ],
+                                                                                },
+                                                                              ],
+                                                                          },
+                                                                        ],
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
+                                                      ],
                                                     },
                                                   ],
                                                 },
@@ -484,69 +770,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: [
@@ -554,7 +862,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -562,7 +870,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -570,7 +878,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -578,178 +886,88 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
-          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,
+          // width: 30,
           align: "center",
           className: "h",
         },
       ],
+
+      //受众关联table数据
       tabledata2: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
         },
         {
           key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
         },
         {
           key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
         },
       ],
       tablecolumns2: [
         {
-          title: "姓名",
+          title: "受众名称",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -757,25 +975,38 @@ export default {
           className: "h",
         },
         {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
           width: 35,
           align: "center",
           className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
         },
         {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
           width: 30,
           align: "center",
           className: "h",
         },
         {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
           width: 40,
           align: "center",
           className: "h",
@@ -791,6 +1022,31 @@ export default {
           label: "人力资源hrbp",
         },
       ],
+      //快速选人-------------------------------------
+      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";
@@ -800,17 +1056,349 @@ 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);
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(
+        document.getElementById("ManageRight").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("ManageRight")
+        .querySelector("#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("ManageRight").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("ManageRight")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("ManageRight")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("ManageRight").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ManageRight")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("ManageRight")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("ManageRight")
+        .querySelector("#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 {
@@ -818,9 +1406,30 @@ export default {
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelectChange1,
       onSelectChange2,
       // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      departmentSelect1,
+      addOrgModal,
+      addOrg,
+      closeOrgModal,
+      selectedsHeight1,
+      morePeopleShow1,
+      morePeopleHidden1,
+      deleteChoosePeople1,
+
+      selectedsHeight2,
+      morePeopleShow2,
+      morePeopleHidden2,
+      deleteChoosePeople2,
+
+      deleteAll,
+      searchOrg,
     };
   },
 };
@@ -828,13 +1437,16 @@ export default {
 
 <style lang="scss">
 .ManageRight {
+  .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;
@@ -854,21 +1466,23 @@ export default {
     }
     .main {
       display: flex;
-      // height: 80%;
+      //  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);
-        // border-right: 1px solid black;
         .tabs {
           margin-right: 33px;
           .tab1 {
             display: flex;
             flex-wrap: wrap;
-            justify-content: space-between;
+            // justify-content: space-between;
             align-items: center;
             .t1 {
               display: flex;
@@ -887,6 +1501,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -1015,49 +1630,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;
+                }
               }
             }
           }
@@ -1065,45 +1744,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;
@@ -1138,16 +1799,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;
+            //               }
           }
         }
       }
-      .thinLine {
-        width: 1px;
-        height: 100%;
-        background-color: black;
-      }
       .right {
-        width: 35%;
+        width: 320px;
+        flex-shrink: 0;
+        overflow-y: auto;
         .onerow {
           display: flex;
           justify-content: space-between;
@@ -1202,12 +1934,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;
@@ -1265,13 +2022,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/Ownership.vue b/src/components/drawers/Ownership.vue
index 97baeeab..4d70cd0e 100644
--- a/src/components/drawers/Ownership.vue
+++ b/src/components/drawers/Ownership.vue
@@ -4,10 +4,10 @@
     :visible="Ownervisible"
     class="drawerStyle Ownership"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="Ownership">
       <div class="header">
         <div class="headerTitle">归属权</div>
         <img
@@ -21,35 +21,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,189 +66,62 @@
                     <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="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>
@@ -252,38 +129,69 @@
           <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 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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <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="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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>
@@ -293,11 +201,43 @@
         <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";
 export default {
   name: "OwnerShip",
   props: {
@@ -308,6 +248,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -317,16 +258,21 @@ 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: "京东方",
@@ -344,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",
+                },
               ],
             },
             {
@@ -389,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:
+                                                                                                "二十级标题二十级标题",
+                                                                                            },
+                                                                                          ],
+                                                                                      },
+                                                                                    ],
+                                                                                },
+                                                                              ],
+                                                                          },
+                                                                        ],
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
+                                                      ],
                                                     },
                                                   ],
                                                 },
@@ -427,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: [
@@ -497,7 +564,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -505,7 +572,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -513,7 +580,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -521,239 +588,121 @@ 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";
       ctx.emit("update:Ownervisible", false);
     };
-
     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('Ownership').querySelector("#selecteds"), function (ele) {
+        console.log("ele", ele.offsetHeight);
+        if (ele.offsetHeight > 160 && !state.showHidden) {
+          state.showMore = true;
+         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+        } else if (ele.offsetHeight < 160) {
+          state.showMore = false;
+          state.showHidden = false;
+         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+        }
+      });
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "";
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+     document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+    };
+
+    // 结束 快速选人------------------------------------------------------------------
+
+    //全部清除
+    const deleteAll = () => {
+      //快速选人-------------------------------------
+      state.valueSelectboe = null; //快速选人的选择组织
+      state.choosepeople = []; //总的数组
+      state.showMore = false; //是否显示快速选人的查看更多
+      state.showHidden = false; //是否显示收回
+      state.selectedRowKeys = []; //表格选中的key
+      //快速选人-------------------------------------
     };
 
     return {
@@ -761,8 +710,14 @@ export default {
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelectChange1,
-      onSelectChange2,
+      // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      deleteAll,
       // change,
     };
   },
@@ -771,13 +726,16 @@ export default {
 
 <style lang="scss">
 .Ownership {
+  .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;
@@ -797,11 +755,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 {
@@ -809,7 +771,7 @@ export default {
           .tab1 {
             display: flex;
             flex-wrap: wrap;
-            justify-content: space-between;
+            // justify-content: space-between;
             align-items: center;
             .t1 {
               display: flex;
@@ -828,6 +790,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -956,35 +919,97 @@ 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;
-            // }
-            .tableBox {
+              .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;
@@ -1008,45 +1033,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;
@@ -1081,11 +1088,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;
@@ -1140,12 +1223,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,13 +1311,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/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 8dca9dae..087332e6 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -6,7 +6,7 @@
     width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="ProjOwnership">
       <div class="header">
         <div class="headerTitle">归属权</div>
         <img
@@ -121,11 +121,10 @@
                   </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>
@@ -139,27 +138,22 @@
           </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 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>
-<div
+            <div
               class="chose"
-             style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -168,17 +162,20 @@
               v-if="showMore"
               @click="morePeopleShow"
             >
-              <div>查看更多   <img
+              <div>
+                查看更多
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/go.png"
-                /></div>
+                />
+              </div>
             </div>
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -187,13 +184,15 @@
               v-if="showHidden"
               @click="morePeopleHidden"
             >
-              <div>收起 <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
-         </div>
-         
+          </div>
         </div>
       </div>
       <div class="btnn">
@@ -259,9 +258,9 @@ export default {
       pageSize2: 10,
       currentPage2: 1,
       tableDataTotal2: 50,
-     
+
       selectedRowKeys1: [],
-     
+
       activeKey: "1",
       value: [], //级联选择框
       choosevalue: null, //受众选择
@@ -310,7 +309,7 @@ export default {
                   title: "研究部6",
                   value: "研究部6",
                 },
-                 {
+                {
                   title: "研究部7",
                   value: "研究部7",
                 },
@@ -594,16 +593,14 @@ export default {
         },
       ],
 
-    
       //快速选人-------------------------------------
       valueSelectboe: null, //快速选人的选择组织
       choosepeople: [], //总的数组
       selectedKeys: [], //选中部门
       showMore: false, //是否显示快速选人的查看更多
       showHidden: false, //是否显示收回
-       selectedRowKeys: [],//表格选中的key
+      selectedRowKeys: [], //表格选中的key
       //快速选人-------------------------------------
-    
     });
     const closeDrawer = () => {
       state.activeKey = "1";
@@ -614,8 +611,6 @@ export default {
       console.log("state", bool);
     };
 
-    
-
     const getClientHeight = () => {
       state.screenHeight = document.body.clientHeight;
     };
@@ -670,46 +665,45 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     const selectedsHeight = () => {
       let resize = elementResizeDetectorMaker();
-      resize.listenTo(document.getElementById("selecteds"), function (ele) {
+      resize.listenTo(document.getElementById('Ownership').querySelector("#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";
+          document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+         document.getElementById('Ownership').querySelector("#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";
+         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
         }
       });
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
-      document.getElementById("selectedsBox").style.overflow = "";
-      document.getElementById("selectedsBox").style.height = "";
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "";
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
-      document.getElementById("selectedsBox").style.overflow = "hidden";
-      document.getElementById("selectedsBox").style.height = "160px";
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------
 
     //全部清除
-    const deleteAll=()=>{
-       //快速选人-------------------------------------
-      state.valueSelectboe=null //快速选人的选择组织
-     state.choosepeople=[] //总的数组
-     state.showMore=false //是否显示快速选人的查看更多
-     state.showHidden=false//是否显示收回
-     state.selectedRowKeys=[]//表格选中的key
+    const deleteAll = () => {
       //快速选人-------------------------------------
-      
-    }
+      state.valueSelectboe = null; //快速选人的选择组织
+      state.choosepeople = []; //总的数组
+      state.showMore = false; //是否显示快速选人的查看更多
+      state.showHidden = false; //是否显示收回
+      state.selectedRowKeys = []; //表格选中的key
+      //快速选人-------------------------------------
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -1172,7 +1166,7 @@ export default {
       .right {
         width: 320px;
         flex-shrink: 0;
-        overflow-y:auto ;
+        overflow-y: auto;
         .onerow {
           display: flex;
           justify-content: space-between;
@@ -1450,7 +1444,7 @@ export default {
         }
       }
     }
-    .ant-modal-close-x{
+    .ant-modal-close-x {
       display: none;
     }
   }
diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue
index 1de3a9cf..13fd676a 100644
--- a/src/components/drawers/QueryRight.vue
+++ b/src/components/drawers/QueryRight.vue
@@ -4,10 +4,10 @@
     :visible="Queryvisible"
     class="drawerStyle QueryRight"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="QueryRight">
       <div class="header">
         <div class="headerTitle">查看权</div>
         <img
@@ -21,35 +21,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,92 +66,199 @@
                     <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 }"
-                    @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 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: '600px',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                        @select="departmentSelect"
+                        v-model:selectedKeys="selectedKeys"
+                      >
+                        <template #suffixIcon></template>
+                      </a-tree>
+                    </div>
+                    <div class="tableBox tabb" style="margin-top: 16px">
+                      <a-table
+                        style="border: 1px solid #f2f6fe"
+                        :columns="tablecolumns"
+                        :data-source="tabledata"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        expandRowByClick="true"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
+                        }"
                       />
+                      <div class="pa">
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize"
+                          v-model:current="currentPage"
+                          :total="tableDataTotal"
+                          :pagination="false"
+                          class="pagination"
+                          v-if="tableDataTotal > 10"
+                          @change="changePagination"
+                        />
+                      </div>
                     </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"
-                        :dropdown-style="{
-                          maxHeight: '400px',
-                          overflow: 'auto',
-                        }"
-                        placeholder="请输入组织名称"
-                        allow-clear
-                        tree-default-expand-all
-                        :tree-data="treeData"
-                      >
-                      </a-tree-select>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
+                    <div class="nameinp">
+                      <div class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
                     </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </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 class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
                   </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>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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="btn2">
-                      <div class="img2">
-                        <img
-                          src="../../assets/images/courseManage/reset1.png"
-                        />
+                    <div class="t1" style="margin-top: 10px">
+                      <div class="organize">受众名称：</div>
+                      <a-input
+                        v-model:value="nameaddd"
+                        style="width: 260px; 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>
+                      <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="tabb" style="margin-top: 16px">
+
+                  <!-- <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="tableBox tabb" style="margin-top: 16px">
                     <a-table
                       style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns1"
-                      :data-source="tabledata1"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
                       :loading="tableDataTotal === -1 ? true : false"
                       expandRowByClick="true"
                       :scroll="{ x: 500 }"
@@ -155,95 +266,11 @@
                       :pagination="false"
                       :row-selection="{
                         columnWidth: 30,
-                        selectedRowKeys: selectedRowKeys1,
-                        onChange: onSelectChange1,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
                       }"
                     />
-                    <div class="tableBox">
-                      <div class="pa">
-                        <a-pagination
-                          showSizeChanger="true"
-                          showQuickJumper="true"
-                          hideOnSinglePage="true"
-                          :pageSize="pageSize1"
-                          :current="currentPage1"
-                          :total="tableDataTotal1"
-                          class="pagination"
-                        />
-                      </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 }"
-                    @expand="expandTable"
-                    :pagination="false"
-                    :row-selection="{
-                      columnWidth: 30,
-                      selectedRowKeys: selectedRowKeys2,
-                      onChange: onSelectChange2,
-                    }"
-                  />
-                  <div class="tableBox">
-                    <div class="pa">
+                    <div class="pa" style="margin-top: 20px">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -252,6 +279,7 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
+                        v-if="tabledata2 > 10"
                       />
                     </div>
                   </div>
@@ -264,38 +292,197 @@
           <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 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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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 class="chose">
-              李明
-              <div class="ch"></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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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>
@@ -305,11 +492,45 @@
         <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";
+import { toDate } from "../../api/method";
 export default {
   name: "QueryRight",
   props: {
@@ -320,6 +541,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -329,16 +551,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 +582,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 +659,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 +764,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 +856,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -517,7 +864,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -525,7 +872,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -533,178 +880,88 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
-          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,
+          // width: 30,
           align: "center",
           className: "h",
         },
       ],
+
+      //受众关联table数据
       tabledata2: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
         },
         {
           key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
         },
         {
           key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
         },
       ],
       tablecolumns2: [
         {
-          title: "姓名",
+          title: "受众名称",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -712,25 +969,38 @@ export default {
           className: "h",
         },
         {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
           width: 35,
           align: "center",
           className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
         },
         {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
           width: 30,
           align: "center",
           className: "h",
         },
         {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
           width: 40,
           align: "center",
           className: "h",
@@ -746,6 +1016,31 @@ export default {
           label: "人力资源hrbp",
         },
       ],
+      //快速选人-------------------------------------
+      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";
@@ -755,17 +1050,349 @@ 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);
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(
+        document.getElementById("QueryRight").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("QueryRight")
+        .querySelector("#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("QueryRight").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("QueryRight")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("QueryRight")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("QueryRight").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("QueryRight")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("QueryRight")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("QueryRight")
+        .querySelector("#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 {
@@ -773,9 +1400,31 @@ export default {
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelectChange1,
       onSelectChange2,
       // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      departmentSelect1,
+      addOrgModal,
+      addOrg,
+      closeOrgModal,
+      selectedsHeight1,
+      morePeopleShow1,
+      morePeopleHidden1,
+      deleteChoosePeople1,
+
+      selectedsHeight2,
+      morePeopleShow2,
+      morePeopleHidden2,
+      deleteChoosePeople2,
+
+      deleteAll,
+
+      searchOrg,
     };
   },
 };
@@ -783,13 +1432,16 @@ export default {
 
 <style lang="scss">
 .QueryRight {
+  .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 +1461,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 +1477,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 +1496,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -968,49 +1625,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 +1739,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 +1794,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 +1929,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;
@@ -1213,13 +2017,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 89507bf4..82f9ad98 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -6,7 +6,7 @@
     width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="stuadd">
       <div class="header">
         <div class="headerTitle">添加学员</div>
         <img
@@ -136,7 +136,7 @@
                       />
                     </div>
                     <div class="btns">
-                      <div class="btn1">
+                      <div class="btn1" @click="searchOrg">
                         <div class="img1">
                           <img
                             src="../../assets/images/courseManage/search0.png"
@@ -166,7 +166,7 @@
                     <div class="boeTreeTitle">BOE组织树</div>
 
                     <a-tree
-                      class="treeMain"
+                      class="treeMain treeMain2"
                       :style="{ height: screenHeight - 430 + 'px' }"
                       dropdownClassName="changetreedropdownboe"
                       defaultExpandAll
@@ -314,9 +314,9 @@
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -336,9 +336,9 @@
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -347,10 +347,13 @@
               v-if="showHidden"
               @click="morePeopleHidden"
             >
-              <div>收起  <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
           </div>
           <div class="line"></div>
@@ -376,9 +379,9 @@
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -398,9 +401,9 @@
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -409,10 +412,13 @@
               v-if="showHidden1"
               @click="morePeopleHidden1"
             >
-              <div>收起  <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
           </div>
           <div class="line"></div>
@@ -436,9 +442,9 @@
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -458,9 +464,9 @@
             <div
               class="chose"
               style="
-                position: absolute;
-                right: 32px;
-                bottom: -9px;
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
                 font-size: 12px;
                 font-weight: 500;
                 color: #409eff;
@@ -469,10 +475,13 @@
               v-if="showHidden2"
               @click="morePeopleHidden2"
             >
-              <div>收起  <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
           </div>
         </div>
@@ -520,6 +529,7 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
 export default {
   name: "StuAdd",
   props: {
@@ -879,71 +889,78 @@ export default {
       tabledata2: [
         {
           key: 1,
-          name: "小李小李小李小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 2,
-          name: "小刘小刘小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
         },
         {
           key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
         },
         {
           key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
         },
       ],
       tablecolumns2: [
         {
-          title: "姓名",
+          title: "受众名称",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -951,25 +968,38 @@ export default {
           className: "h",
         },
         {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
           width: 35,
           align: "center",
           className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
         },
         {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
           width: 30,
           align: "center",
           className: "h",
         },
         {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
           width: 40,
           align: "center",
           className: "h",
@@ -1074,31 +1104,50 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     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";
+      resize.listenTo(
+        document.getElementById("stuadd").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
         }
-      });
+      );
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
-      document.getElementById("selectedsBox").style.overflow = "";
-      document.getElementById("selectedsBox").style.height = "";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
-      document.getElementById("selectedsBox").style.overflow = "hidden";
-      document.getElementById("selectedsBox").style.height = "160px";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------
@@ -1166,33 +1215,75 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     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";
+      resize.listenTo(
+        document.getElementById("stuadd").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
         }
-      });
+      );
     };
     const morePeopleShow1 = () => {
       state.showMore1 = false;
       state.showHidden1 = true;
-      document.getElementById("selectedsBox1").style.overflow = "";
-      document.getElementById("selectedsBox1").style.height = "";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox1").style.height = "";
     };
     const morePeopleHidden1 = () => {
       state.showMore1 = true;
       state.showHidden1 = false;
-      document.getElementById("selectedsBox1").style.overflow = "hidden";
-      document.getElementById("selectedsBox1").style.height = "160px";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("stuadd")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("stuadd")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
     };
-
     // 结束 添加组织------------------------------------------------------------------
 
     // 开始 受众关联------------------------------------------------------------------
@@ -1225,31 +1316,50 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     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";
+      resize.listenTo(
+        document.getElementById("stuadd").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("stuadd")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
         }
-      });
+      );
     };
     const morePeopleShow2 = () => {
       state.showMore2 = false;
       state.showHidden2 = true;
-      document.getElementById("selectedsBox2").style.overflow = "";
-      document.getElementById("selectedsBox2").style.height = "";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox2").style.height = "";
     };
     const morePeopleHidden2 = () => {
       state.showMore2 = true;
       state.showHidden2 = false;
-      document.getElementById("selectedsBox2").style.overflow = "hidden";
-      document.getElementById("selectedsBox2").style.height = "160px";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("stuadd")
+        .querySelector("#selectedsBox2").style.height = "160px";
     };
 
     // 结束 受众关联------------------------------------------------------------------
@@ -1309,6 +1419,8 @@ export default {
       deleteChoosePeople2,
 
       deleteAll,
+
+      searchOrg,
     };
   },
 };

From b11018a8f36d934f53cbcaf6ec5a988fedacd473 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Mon, 14 Nov 2022 17:14:02 +0800
Subject: [PATCH 36/90] =?UTF-8?q?feat:=E6=8A=95=E7=A5=A8=E7=9A=84=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEid=E8=8E=B7=E5=8F=96=E6=8A=95=E7=A5=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E7=BC=96=E8=BE=91=E6=8A=95=E7=A5=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E6=A0=B9=E6=8D=AEid=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B2=E4=BF=A1=E6=81=AF=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B2=E4=BF=A1=E6=81=AF=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddVote.vue        | 129 +++++++++++++++++++---
 src/components/drawers/CreVote.vue        | 119 +++++++++++++++++++-
 src/views/learningpath/LevelAddDetail.vue |   9 +-
 src/views/projectcenter/TaskAdd.vue       |  14 ++-
 src/views/projectcenter/TaskPage.vue      |   2 +-
 5 files changed, 247 insertions(+), 26 deletions(-)

diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index 63b38ae1..9986004b 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -65,7 +65,7 @@
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{voteStemName}}</span>
+                  <span style="color: #388be1">{{ballotName}}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -76,6 +76,7 @@
                 v-model:crevoteVisible="crevotevisible"
                 @getData="getStemId"
                 v-model:voteStemId="voteStemId"
+                v-model:editStem="editStem"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -122,7 +123,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2" @click="createVoteText()">确定</button>
+        <button class="btn2" @click="creoredi()">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -184,6 +185,14 @@ export default {
       type: Number,
       default: null,
     },
+    voteId: {
+      type: Number,
+      default: null,
+    },
+    ballotId: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
     const state = reactive({
@@ -199,34 +208,52 @@ export default {
       voteStemId: null,
       voteId:"",
       voteStemName:"",
+      ballotName: "",
+      editStem: false,  //编辑状态
+      ballotId: "", //题干id
+      optionId: "", //删除，修改选项id
     });
     const closeDrawer = () => {
+      state.inputV1 = "",
+        state.textV1 = "",
+        state.startTimes = "",
+        state.time = undefined,
+        state.endTimes = "",
+        state.basevote = "",
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      // if (props.edit == true) {
+      //   queryVoteText()
+      // }
     };
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
+      if (state.creVote == true) {
+        state.editStem = true
+      }
     };
     const getStemId = (data) => {
+      state.ballotName = data.ballotName;
       state.voteStemName = data.voteStemName;
       state.voteStemId = Number(data.voteStemId);
+      state.ballotId = Number(data.ballotId)
       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 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;
     };
@@ -247,6 +274,16 @@ export default {
           delBox()
       })
     }
+
+    //新建还是编辑方法
+    const creoredi = () => {
+      if (props.eidt == false) {
+        createVoteText()
+      }
+      else {
+        changeVoteText()
+      }
+    }
     //创建投票信息
     const createVoteText = () => {
       if (!state.inputV1) {
@@ -271,25 +308,34 @@ export default {
 
 
       let obj = {
-        ascriptionId: state.ascriptionId,
+        ballotId: state.ballotId,
         baseVote: state.basevote,
+        createTime: "",
         createUser: 0,
+        updateTime: "",
         updateUser: 0,
         voteEndTime: state.endTimes,
         voteExplain: state.textV1,
         voteFlag: "",
+        voteId: 0,
         voteName: state.inputV1,
         voteStartTime: state.startTimes,
-        voteTag: "",
+        voteTag: ""
+
       };
       api
         .createVote(obj)
         .then((res) => {
           console.log("创建成功123", res);
           message.success("创建成功");
-          ctx.emit("getData", res.data.data.voteId);
+          let changeVoteId = {
+            voteId: res.data.data.voteId,
+            ballotId: state.ballotId,
+          }
+          ctx.emit("getData", changeVoteId);
           closeDrawer();
           if (props.learn == 0)
+            //添加到项目任务列表
             apitaskadd
               .addTask({
                 courseId: 0,
@@ -330,18 +376,71 @@ export default {
           console.log("创建失败", err);
         });
     };
+
+    //根据投票id获取投票信息
+    // const queryVoteText = ()=>{
+    //   let objqurvt = {
+    //     voteStemId:state.voteStemId
+    //     //没有接口 个人认为应该是这个id
+    //   }
+    //   api
+    //   //目前没接口 大概写的
+    //   .queryVoteText(objqurvt)
+    //   .then((res)=>{
+    //     console.log('获取投票信息成功',res);
+    //      state.inputV1 = res.data.data.voteName
+    //      state.endTimes = res.data.data.voteEndTime
+    //      state.startTimes = res.data.data.voteStartTime
+    //      state.textV1 = res.data.data.voteExplain
+    //      state.baseVote = res.data.data.baseVote
+    //      state.ascriptionId = res.data.data.ascriptionId
+    //      state.ballotId = res.data.data.ballotId
+    //   })
+    //   .catch((err)=>{
+    //     console.log('获取投票信息失败',err);
+    //   })
+    // }
+    //修改投票信息接口
+    const changeVoteText = () => {
+      let objcvt = {
+        ballotId: state.ballotId,
+        baseVote: state.basevote,
+        createTime: "",
+        createUser: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: state.endTimes,
+        voteExplain: state.textV1,
+        voteFlag: "",
+        voteId: state.voteId,
+        voteName: state.inputV1,
+        voteStartTime: state.startTimes,
+        voteTag: ""
+      }
+      api
+        .editVote(objcvt)
+        .then((res) => {
+          console.log('修改投票信息成功', res);
+        })
+        .catch((err) => {
+          console.log('修改投票信息失败', err);
+        })
+    }
     return {
       ...toRefs(state),
       showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,
       getStemId,
-      changeVData,
+      // changeVData,
       rowSelection,
       options1,
       dleVoteStem,
+      creoredi,
       createVoteText,
+      changeVoteText,
       delBox,
+      // queryVoteText,
       updateTableData,
     };
   },
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index eb05cc62..a0e4dbf8 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">创建投票</div>
+        <div v-if="editStem" class="headerTitle">编辑投票</div>
+        <div v-else class="headerTitle">创建投票</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -106,7 +107,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2" @click="createQueTit">确定</button>
+        <button class="btn2" @click="creoredi()">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -122,6 +123,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    editStem: {
+      type: Boolean,
+      default: false,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -178,12 +183,40 @@ export default {
       value.splice(value[index],1)
     }
     const closeDrawer = () => {
+      state.inputV1 ="",
+      state.questions=[
+        {
+          stemTit: "题干",
+          inputV: "",
+          options: [
+            {
+              title: "选项",
+              opvalue: "",
+            },
+            {
+              title: "选项",
+              opvalue: "",
+            },
+          ],
+        },
+      ],
       ctx.emit("update:crevoteVisible", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if (props.editStem == true) {
+        queryStemText()
+      }
     };
-
+    //创建题干还是编辑题干
+    const creoredi = () => {
+      if (props.eidtStem == false) {
+        createQueTit()
+      }
+      else {
+        changeStemText()
+      }
+    }
     //创建题干接口
     const createQueTit = () => {
       if (!state.inputV1) {
@@ -258,8 +291,10 @@ export default {
           // console.log('state.questions[0].inputV',state.questions[0].inputV);
           message.success("创建成功");
           let objstem = {
+            ballotName: state.inputV1,
             voteStemName: state.questions[0].inputV,
             voteStemId: res.data.data.voteStemVoList[0].voteStemId,
+            ballotId: res.data.data.ballotId,
             creVote: true,
           };
           ctx.emit("getData", objstem);
@@ -269,6 +304,82 @@ export default {
           console.log(err);
         });
     };
+    //删除选项信息
+    const delOptText = () => {
+      let objdelopt = {
+        // optionId: optionId
+      }
+      api
+        .deleteVoteStemOption(objdelopt)
+        .then((res) => {
+          console.log('删除选项信息成功', res);
+        })
+        .catch((err) => {
+          console.log('删除选项信息失败', err);
+        });
+    }
+    //根据id获取题干信息
+    const queryStemText = () => {
+      let objqurst = {
+        stemId: 1,
+        ballotId: "",
+      }
+      api
+        .queryStemByStemId(objqurst)
+        .then((res) => {
+          console.log('获取题干信息成功', res);
+          state.inputV1 = res.data.data.voteName
+        })
+        .catch((err) => {
+          console.log('获取题干信息失败', err);
+        })
+    }
+    //编辑题干信息
+    const changeStemText = () => {
+      let objcst = {
+        "ballotId": 0,
+        "ballotName": "",
+        "createTime": "",
+        "createUser": 0,
+        "updateTime": "",
+        "updateUser": 0,
+        "voteStemDtoList": [
+          {
+            "ballotId": 0,
+            "createTime": "",
+            "createUser": 0,
+            "optionDetailList": [
+              {
+                "createTime": "",
+                "createUser": 0,
+                "optionFlag": "",
+                "optionId": 0,
+                "optionName": "",
+                "optionOrderNum": "",
+                "optionPictureAddress": "",
+                "stem": "",
+                "updateTime": "",
+                "updateUser": 0,
+                "voteStemId": 0
+              }
+            ],
+            "orderNumber": "",
+            "updateTime": "",
+            "updateUser": 0,
+            "voteStemFlag": "",
+            "voteStemId": 0,
+            "voteStemName": ""
+          }
+        ]
+      }
+      api.updateStemMessage(objcst)
+        .then((res) => {
+          console.log('修改题干信息成功', res);
+        })
+        .catch((err) => {
+          console.log('修改题干信息失败', err);
+        })
+    }
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -277,7 +388,9 @@ export default {
       delQue,
       addOpt,
       delOpt,
+      creoredi,
       createQueTit,
+      delOptText,
     };
   },
 };
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index f1112328..81a71774 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1244,18 +1244,21 @@ export default {
     };
     //测试评估投票抽屉
     const showDrawerAddEval = (id, eleId) => {
-      state.addevalVisible = true;
+      // state.addevalVisible = true;
+      state.addevalvisible = true;
       state.EditEvalId = id;
       state.routerTaskId = eleId;
     };
     const showDrawerAddInvist = (id, eleId) => {
-      state.addinvistVisible = true;
+      // state.addinvistVisible = true;
+      state.addinvistvisible = true;
       state.routerTaskId = eleId;
       state.EditInvistId =id;
      
     };
     const showDrawerAddVote = (id, eleId) => {
-      state.addhomeworkvisible = true;
+      // state.addhomeworkvisible = true;
+      state.addvotevisible = true;
       state.EditVoteId = id;
       state.routerTaskId = eleId;
     };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 293616e0..cb6a6a98 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -325,7 +325,8 @@
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
-                v-model:EditVoteId = "EditVoteId"
+                v-model:voteId = "voteId"
+                v-model:ballotId = "ballotId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -926,7 +927,8 @@ export default {
       EditTestId: null,// 要编辑的考试id
       EditEvalId:null,
       EditInvistId:null,
-      EditVoteId:null,
+      EditVoteId: null, //编辑需要投票的id
+      ballotId: "", //编辑需要的题干id
       projectTaskId:null, // 要编辑的具体任务id
       projectNameList: [
         {
@@ -1353,10 +1355,11 @@ export default {
 
 
 
-    //获取删除id（投票)
+    //获取修改、删除id（投票)
     const changeVData = (data) => {
-      console.log("8989", data);
+      console.log("获取修改、删除id投票", data);
       state.voteId = data.voteId;
+      state.ballotId = data.ballotId;
     };
     //数据变化
     const updateTableData = (data) => {
@@ -1519,9 +1522,12 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
+      console.log(id, eleId, '95835325932953295325');
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
+      // voteId = state.voteId;
+      // ballotId = state.ballotId;
     };
     const showConfirm = () => {
       state.confirmModal = true;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 2b331d6f..eee6cca9 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -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" />

From 00179237a4d17dabd45987bd11def905d866f1d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Mon, 14 Nov 2022 17:45:09 +0800
Subject: [PATCH 37/90] =?UTF-8?q?fix:=20=E5=85=B3=E5=8D=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8bug=EF=BC=8C=E5=92=8C=E5=8F=B3=E4=BE=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/FaceManage.vue |   2 +-
 src/components/drawers/TestManage.vue |   2 +-
 src/components/drawers/TimeManage.vue |   2 +-
 src/components/drawers/WorkManage.vue |   2 +-
 src/views/learningpath/LevelAdd.vue   | 226 ++++----------------------
 5 files changed, 34 insertions(+), 200 deletions(-)

diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index d30f9203..68a3273d 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -362,7 +362,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+      //  getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 38f4a605..ca76fd5a 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -291,7 +291,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+        // getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index eae03011..ef802882 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -291,7 +291,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+      //  getManageList();
       }, 500);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 163d0d6a..0962b1f4 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -312,7 +312,7 @@ export default {
 
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+       // getManageList();
       }, 1000);
     });
     return {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index b0cef46f..fd563c8a 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -263,6 +263,7 @@
               </router-link>
             </div>
             <!-- 无数据显示快速创建 -->
+            <div v-show="!taskSyllabus.length">
             <router-link :to="{ path: '/leveladddetail' }">
               <div
                 class="taskbox"
@@ -283,6 +284,7 @@
                 <div class="centermain">快速创建关卡任务</div>
               </div>
             </router-link>
+          </div>
             <!-- 无数据显示快速创建 -->
 
             <!-- 有数据-->
@@ -396,7 +398,7 @@
                         class="operation"
                         style="cursor: pointer"
                         :style="{
-                          display: item.course === '面授' ? 'flex' : 'none',
+                          display: item.type === 2 ? 'flex' : 'none',
                         }"
                         @click="showFS"
                       >
@@ -405,10 +407,10 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA(item.course, item.name)"
+                        @click="showAA(item.type, item.name)"
                         :style="{
                           display:
-                            item.course === '直播' || item.course === '活动'
+                            item.type === 6 || item.type === 9
                               ? 'flex'
                               : 'none',
                         }"
@@ -420,19 +422,19 @@
                         style="cursor: pointer"
                         :style="{
                           display:
-                            item.course === '直播' ||
-                            item.course === '活动' ||
-                            item.course === '面授'
+                            item.type === 6 ||
+                            item.type === 9 ||
+                            item.type === 2
                               ? 'flex'
                               : 'none',
                         }"
                         @click="
-                          item.course === '面授'
-                            ? showCopyModal(item.course)
-                            : item.course === '直播'
-                            ? showzhibModal(item.course)
-                            : item.course === '活动'
-                            ? showhuodModal(item.course)
+                          item.type ===2
+                            ? showCopyModal(item.type)
+                            : item.type === 6
+                            ? showzhibModal(item.type)
+                            : item.type === 9
+                            ? showhuodModal(item.type)
                             : null
                         "
                       >
@@ -442,21 +444,21 @@
                         class="operation"
                         style="cursor: pointer; margin-right: 35px"
                         @click="
-                          item.course === '在线' ||
-                          item.course === '案例' ||
-                          item.course === '外链' ||
-                          item.course === '讨论' ||
-                          item.course === '直播' ||
-                          item.course === '评估' ||
-                          item.course === '投票' ||
-                          item.course === '活动'
-                            ? showTime(item.course, item.name)
-                            : item.course === '考试' || item.course === '测评'
-                            ? showTest(item.course, item.name)
-                            : item.course === '面授'
-                            ? showFace(item.course)
-                            : item.course === '作业'
-                            ? showWork(item.course)
+                          item.type === 1 ||
+                          item.type === 3 ||
+                          item.type === 7 ||
+                          item.type === 8 ||
+                          item.type === 6 ||
+                          item.type === 11 ||
+                          item.type === 12 ||
+                          item.type === 9
+                            ? showTime(item.type, item.name)
+                            : item.type === 5 || item.type === 10
+                            ? showTest(item.type, item.name)
+                            : item.type === 2
+                            ? showFace(item.type)
+                            : item.type === 4
+                            ? showWork(item.type)
                             : null
                         "
                       >
@@ -638,81 +640,7 @@
                   </div>
                 </div>
               </div>
-              <div class="Gcon">
-                <div class="pad"></div>
-                <div class="Gin" style="margin-top: 0px">
-                  <div class="headone">
-                    <div class="box"></div>
-                    <div class="onetitle">关卡晋级规则</div>
-                  </div>
-                  <div class="twomain clearfix">
-                    <a-switch
-                      size="small"
-                      v-model:checked="checked2"
-                      style="margin-top: -5px"
-                    />
-                    <span class="info">启用关卡自动规则加入</span>
-                    <div class="infor">
-                      若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
-                    </div>
-                    <div :class="[checked2 ? 'chooseshow' : 'choo']">
-                      <div class="fane">选择范围</div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="projectName"
-                          style="
-                            width: 250px;
-                            border-radius: 8px;
-                            margin-top: 15px;
-                          "
-                          placeholder="请选择部门"
-                          :options="projectNameList"
-                          @change="selectProjectName3"
-                          allowClear
-                          showSearch
-                        ></a-select>
-                      </div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="projectName2"
-                          style="
-                            width: 250px;
-                            border-radius: 8px;
-                            margin-top: 15px;
-                          "
-                          placeholder="请选择岗位"
-                          :options="projectNameList2"
-                          @change="selectProjectName2"
-                          allowClear
-                          showSearch
-                        ></a-select>
-                      </div>
-                    </div>
-                    <div class="btm">
-                      <div class="bmo">关卡学习方案展示设置</div>
-                      <div class="bmt">仅支持移动端</div>
-                      <div class="chosecon">
-                        <div class="chose">
-                          <input
-                            type="checkbox"
-                            name="cb1"
-                            value="lieb"
-                            class="inl"
-                          /><span class="sh">列表展示</span>
-                        </div>
-                        <div class="chose" style="margin-left: 20px">
-                          <input
-                            type="checkbox"
-                            name="cb1"
-                            value="lieb"
-                            class="inl"
-                          /><span class="sh">路径展示</span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
+              
             </div>
           </a-tab-pane>
 
@@ -1010,79 +938,6 @@ export default {
       ], 
       huodModal: false,
       zhibModal: false,
-      projectNameListt: [
-        {
-          id: 1,
-          value: "导出信息",
-          label: "导出信息",
-        },
-        {
-          id: 2,
-          value: "批量调整关卡",
-          label: "批量调整关卡",
-        },
-        {
-          id: 3,
-          value: "批量删除",
-          label: "批量删除",
-        },
-      ],
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList2: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList4: [
-        {
-          id: 1,
-          value: "关卡1",
-          label: "关卡1",
-        },
-        {
-          id: 2,
-          value: "关卡2",
-          label: "关卡2",
-        },
-      ],
       //任务大纲列表
       taskSyllabus: [
         {
@@ -1109,7 +964,6 @@ export default {
       nubvalue3: ref("4"),
       nubvalue1: ref("4"),
       fileList:ref([]),
-      checked2: false,
       docChecked:true,
       currentPage: 1,
       tableDataTotal: 100,
@@ -1263,22 +1117,6 @@ export default {
       ]
     })
 
-    // console.log("store", state.routerId);
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-      if (value === "批量删除") {
-        showDeleteALLModal();
-      }
-    };
-    const selectProjectName2 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName3 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName4 = (value, index) => {
-      console.log("value", value, index);
-    };
     const tableDataFunc = () => {
       const columns = [
         {
@@ -1601,10 +1439,6 @@ export default {
     return {
       ...toRefs(state),
       ...toRefs(levelList),
-      selectProjectName,
-      selectProjectName2,
-      selectProjectName3,
-      selectProjectName4,
       showDeleteALLModal,
       closeDeleteALLModal,
       tableDataFunc,

From c7dc4dd6e0150985591584d335e08066863cbcf4 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Mon, 14 Nov 2022 18:18:57 +0800
Subject: [PATCH 38/90] =?UTF-8?q?feat=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E5=BC=B9=E7=AA=97=20=E6=A6=82?=
 =?UTF-8?q?=E8=A7=88=20=E8=8E=B7=E5=8F=96=E8=A7=84=E5=88=99=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=BC=96=E8=BE=91=20=E5=85=B1=E4=BA=AB=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js                   |   5 +-
 src/components/drawers/ProjectScore.vue   | 137 +++-
 src/components/drawers/StuAdd.vue         |  22 +-
 src/views/projectcenter/ProjectManage.vue |   4 +-
 src/views/projectcenter/TaskAdd.vue       |  85 ++-
 src/views/projectcenter/TaskPage.vue      | 888 ++++++++++++----------
 6 files changed, 702 insertions(+), 439 deletions(-)

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 392664b7..b8dfc793 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -22,4 +22,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess',
 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
 
 //项目概览
-export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
\ No newline at end of file
+export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
+
+//设置项目积分规则
+export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
\ No newline at end of file
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 0ba76354..9a590d99 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -164,8 +164,50 @@
                 ><span class="scoretext">{{ score1 }} </span><span>积分</span>
               </div>
               <div class="content">
-                <span>优秀学员可获得 </span
-                ><span class="scoretext">{{ score2 }}</span
+                <span>完成在线课程获得 </span
+                ><span class="scoretext">{{ done }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成面授课程获得 </span
+                ><span class="scoretext">{{ done1 }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成作业成绩不低于 </span
+                ><span class="scoretext">{{ done2 }}</span
+                ><span>分获得</span>
+                <span class="scoretext">{{ done3 }}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>前</span
+                ><span class="scoretext">{{ four1}}</span
+                ><span>名学完在线课程获得</span>
+                <span class="scoretext">{{ four2}}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>前</span
+                ><span class="scoretext">{{ four3}}</span
+                ><span>名提交作业且成绩不低于</span>
+                <span class="scoretext">{{ four4}}</span
+                ><span >分获得</span>
+                <span class="scoretext">{{ four5}}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考试成绩高于</span
+                ><span class="scoretext">{{ five1 }}</span
+                ><span>分获得</span>
+                <span class="scoretext">{{ five2 }}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考勤正常学员获得 </span
+                ><span class="scoretext">{{ six1}}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>成为小组长获得</span
+                ><span class="scoretext">{{ seven1 }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>优秀学员可获得</span>
+                <span class="scoretext">{{ seven2 }}</span
                 ><span>积分</span>
               </div>
             </div>
@@ -186,11 +228,82 @@
                 ><span>积分</span>
               </div>
               <div class="content">
-                <span>优秀学员可获得 </span
+                <span>完成在线课程获得 </span
                 ><span
-                  ><a-input v-model:value="score2" :bordered="false" /></span
-                ><span>积分</span>
+                  ><a-input v-model:value="done" :bordered="false" /></span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成面授课程获得 </span
+                ><a-input
+                    v-model:value="done1"
+                    :bordered="false"
+                  />
+                  <span style="margin-right:50px">积分</span>
+                  <span>完成作业成绩不低于 </span
+                ><a-input
+                    v-model:value="done2"
+                    :bordered="false"
+                  /><span>分获得</span>
+                  <a-input
+                    v-model:value="done3"
+                    :bordered="false"
+                  /><span>积分</span>
               </div>
+              <div class="content">
+                <span>前</span
+                ><a-input
+                    v-model:value="four1"
+                    :bordered="false"
+                  /><span>名学完在线课程获得</span>
+                  <a-input
+                    v-model:value="four2"
+                    :bordered="false"
+                  /><span style="margin-right:50px">积分</span>
+                <span>前</span
+                ><a-input
+                    v-model:value="four3"
+                    :bordered="false"
+                  /><span>名提交作业且成绩不低于</span>
+                  <a-input
+                    v-model:value="four4"
+                    :bordered="false"
+                  /><span >分获得</span>
+                  <a-input
+                    v-model:value="four5"
+                    :bordered="false"
+                  /><span>积分</span>
+
+              </div>
+              <div class="content">
+                <span>考试成绩高于</span
+                ><a-input
+                    v-model:value="five1"
+                    :bordered="false"
+                  /><span>分获得</span>
+                  <a-input
+                    v-model:value="five2"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考勤正常学员获得 </span
+                ><a-input
+                    v-model:value="six1"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              <div class="content">
+                <span>成为小组长获得</span
+                ><a-input
+                    v-model:value="seven1"
+                    :bordered="false"
+                  /><span style="margin-right:50px">积分</span>
+                <span>优秀学员可获得</span>
+                <a-input
+                    v-model:value="seven2"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              
             </div>
           </div>
         </div></a-tab-pane
@@ -372,6 +485,20 @@ export default {
       Svisible: false,
       score1: 5,
       score2: 5,
+      done:null,
+      done1:null,
+      done2:null,
+      done3:null,
+      four1:null,
+      four2:null,
+      four3:null,
+      four4:null,
+      four5:null,
+      five1:null,
+      five2:null,
+      six1:null,
+      seven1:null,
+      seven2:null,
       edit: true,
       searchRankName:null,//榜单搜索名称
     });
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index 89507bf4..cc57daa2 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -347,10 +347,13 @@
               v-if="showHidden"
               @click="morePeopleHidden"
             >
-              <div>收起  <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
           </div>
           <div class="line"></div>
@@ -409,10 +412,13 @@
               v-if="showHidden1"
               @click="morePeopleHidden1"
             >
-              <div>收起  <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
           </div>
           <div class="line"></div>
@@ -469,10 +475,13 @@
               v-if="showHidden2"
               @click="morePeopleHidden2"
             >
-              <div>收起  <img
+              <div>
+                收起
+                <img
                   style="width: 10px; height: 12px; margin-top: -2px"
                   src="../../assets/images/projectadd/pickUp.png"
-                /></div>
+                />
+              </div>
             </div>
           </div>
         </div>
@@ -1051,6 +1060,7 @@ export default {
       // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
       state.selectedRowKeys = selectedRowKeys;
       state.choosepeople = item.reverse();
+      console.log(item, "选中你了！", state.choosepeople);
       selectedsHeight();
     };
     //单个删除选中的人
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 00a53bf2..2f1873f2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1161,7 +1161,6 @@ export default {
       getTableDate();
     };
 
-
     const searchSubmit = () => {
       console.log("点击了搜索");
       state.currentPage = 1;
@@ -2921,6 +2920,9 @@ export default {
                     data.subList.map((data2) => {
                       data2.paraentName = value.name + "/" + data.name;
                       data2.isbj = "class";
+                      storage.set("isbj", data.projectId);
+                      // console.log(data2.paraentName, "conme");
+                      storage.set("pN", data2.paraentName);
                     });
                     // console.log("lalallalaa", data);
                   } else {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 293616e0..97ecea72 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -303,7 +303,7 @@
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
-              v-model:EditInvistId = "EditInvistId"
+              v-model:EditInvistId="EditInvistId"
             />
           </div>
           <!-- 添加评估侧弹窗 -->
@@ -325,7 +325,7 @@
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
-                v-model:EditVoteId = "EditVoteId"
+                v-model:EditVoteId="EditVoteId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -337,7 +337,7 @@
           <div class="onerow">
             <div class="taskmain">任务列表</div>
             <button class="btn" @click="showChangeModal">移动任务到阶段</button>
-            <div class="edit" @click="deleteTaskAll">
+            <div class="edit" @click="showdeAll">
               <img
                 class="editimg"
                 src="../../assets/images/projectadd/delete.png"
@@ -787,6 +787,35 @@
         </div>
       </div>
     </a-modal>
+    <a-modal
+      v-model:visible="deAll"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      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="closeDeAll"></div>
+          </div>
+          <div class="body">
+            <span>您确定要批量删除任务吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="closeDeAll">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="deleteTaskAll">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal
       style="padding: 0"
@@ -850,7 +879,6 @@ import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 
-
 const drawercolumns = [
   {
     title: "项目名称",
@@ -920,14 +948,15 @@ export default {
       isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的ids
-      EditDiscussId:null,//要编辑的讨论的id
-      EditActiveId:null,//要编辑的活动id
-      EditWorkId:null, // 要编辑的作业id
-      EditTestId: null,// 要编辑的考试id
-      EditEvalId:null,
-      EditInvistId:null,
-      EditVoteId:null,
-      projectTaskId:null, // 要编辑的具体任务id
+      EditDiscussId: null, //要编辑的讨论的id
+      EditActiveId: null, //要编辑的活动id
+      EditWorkId: null, // 要编辑的作业id
+      EditTestId: null, // 要编辑的考试id
+      EditEvalId: null,
+      EditInvistId: null,
+      EditVoteId: null,
+      projectTaskId: null, // 要编辑的具体任务id
+      deAll: false,
       projectNameList: [
         {
           id: 1,
@@ -1325,7 +1354,6 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-     
               let arr = res.data.data.stageList[0].taskList;
               console.log("任务列表", arr);
               getTableData(arr);
@@ -1351,8 +1379,6 @@ export default {
         });
     };
 
-
-
     //获取删除id（投票)
     const changeVData = (data) => {
       console.log("8989", data);
@@ -1363,7 +1389,7 @@ export default {
       console.log("添加数据", data);
       getTask(data);
     };
-    
+
     //删除任务
     const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
@@ -1420,8 +1446,11 @@ export default {
           })
           .catch((err) => {
             console.log(err);
+            message.destroy();
+            message.warning("批量删除失败");
           });
       });
+      state.deAll = false;
     };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
@@ -1502,12 +1531,12 @@ export default {
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     };
-   
+
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.projectTaskId = eleId;
-      console.log("active=======",id);
+      console.log("active=======", id);
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
@@ -1566,6 +1595,8 @@ export default {
         });
       }
       state.selectRow = arr;
+      console.log(state.selectRow, "xuanzhong");
+      console.log(Object.prototype.toString.call(state.selectRow));
       //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
       if (arr.length !== 0) {
         if (arr.length === state.tableData.length) {
@@ -1607,8 +1638,7 @@ export default {
     const changeCourseType = (id) => {
       console.log("任务id", id);
     };
- 
- 
+
     //打开测评的弹窗
     const showEditEvalDrawer = (id, eleId) => {
       console.log("222222222222222222222", id);
@@ -1641,6 +1671,17 @@ export default {
         showDrawerAddTest(id, eleId);
       }
     };
+    const showdeAll = () => {
+      if(state.selectRow.length==0){
+        message.destroy()
+        return message.warning("请选择要删除的任务")
+      }else{
+        state.deAll = true;
+      }
+    };
+    const closeDeAll = () => {
+      state.deAll = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1688,8 +1729,8 @@ export default {
       moveTask,
       deleteTaskAll,
       decideType,
-      
-      
+      showdeAll,
+      closeDeAll,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 223c22a9..78918d7c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -175,11 +175,17 @@
               <div class="stage2">阶段2</div>
             </div> -->
             <div class="stagemess">
-              <div v-for="item in stageList" 
-              :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
-              :key="item.stageId" @click="choosedStageId = item.stageId">
-              {{item.stage}}
-            </div>
+              <div
+                v-for="item in stageList"
+                :class="{
+                  stage1: item.stageId == choosedStageId,
+                  stage2: item.stageId != choosedStageId,
+                }"
+                :key="item.stageId"
+                @click="choosedStageId = item.stageId"
+              >
+                {{ item.stage }}
+              </div>
               <!-- <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div> -->
             </div>
@@ -216,20 +222,35 @@
                 <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
-                <div class="pronub" style="margin-left: 280px">{{stageOverviewList.totalTaskCnt}}</div>
+                <div class="pronub" style="margin-left: 280px">
+                  {{ stageOverviewList.totalTaskCnt }}
+                </div>
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>
-                  <a-progress :percent="stageOverviewList.totalTaskCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="stageOverviewList.totalTaskCnt"
+                    style="width: 369px"
+                  />
+                </div>
+                <div class="pronub" style="margin-left: 206px">
+                  {{ stageOverviewList.totalReqCnt }}
                 </div>
-                <div class="pronub" style="margin-left: 206px">{{stageOverviewList.totalReqCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress :percent="stageOverviewList.totalReqCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="stageOverviewList.totalReqCnt"
+                    style="width: 369px"
+                  />
+                </div>
+                <div class="pronub" style="margin-left: 142px">
+                  {{ stageOverviewList.totalOptCnt }}
                 </div>
-                <div class="pronub" style="margin-left: 142px">{{stageOverviewList.totalOptCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress :percent="stageOverviewList.totalOptCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="stageOverviewList.totalOptCnt"
+                    style="width: 369px"
+                  />
                 </div>
               </div>
             </div>
@@ -454,7 +475,6 @@
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
                   display: block;
                 "
-               
               >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left2.png" />
@@ -857,140 +877,159 @@
         </a-tab-pane>
         <a-tab-pane key="7" tab="设置">
           <div class="split"></div>
-          
+
           <a-tabs v-model:activeKey="activeSetKey">
-          <a-tab-pane key="12" tab="基本信息">
-            <div class="content7">
-            <!-- <div class="set_tit">
+            <a-tab-pane key="12" tab="基本信息">
+              <div class="content7">
+                <!-- <div class="set_tit">
               <span>基本信息</span>
             </div> -->
-            
-            <!-- <div class="line"></div> -->
-            <div class="set_body">
-              <!-- <div class="edit" @click="showEditProj">
+
+                <!-- <div class="line"></div> -->
+                <div class="set_body">
+                  <!-- <div class="edit" @click="showEditProj">
                 <div class="img"></div>
                 <div class="ed">编辑</div>
               </div> -->
-               <div class="edit">
-                <div class="img"></div>
-                <div class="ed">编辑</div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目名称：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999">{{ name }}</span>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>封面图：</span></div>
-                <div class="setc_main">
-                  <img
-                    style="width: 151px; height: 84px"
-                    :src="picUrl"
-                    alt=""
-                  />
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目时间：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999"
-                    >{{ startTime }} ～ {{ endTime }}</span
-                  >
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目经理：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999">{{ manager }}</span>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>资源归属：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999">{{ sourceBelong }}</span>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目说明：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999">{{ remark }}</span>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>同步学习记录：</span></div>
-                <div class="setc_main">
-                  <a-radio v-model:checked="checkedSty"
-                    ><span style="color: #333333"
-                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                    ></a-radio
-                  >
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目级别：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999">{{ level }}</span>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>培训体系：</span></div>
-                <div class="setc_main">
-                  <span style="color: #999999">{{ systemId }}</span>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>是否BOEU实施：</span></div>
-                <div class="setc_main">
-                  <a-radio v-model:checked="checkedBOEU"
-                    ><span style="color: #333333">BOEU实施</span></a-radio
-                  >
-                </div>
-              </div>
-            </div>
-          </div>
-          </a-tab-pane>
-          <a-tab-pane key="13" tab="共享文档">
-            <div class="sametab">
-              <div class="Gcon">
-                <div class="pad"></div>
-                <div class="Gin">
-                  <div class="headone">
-                    <div class="box"></div>
-                    <div class="onetitle">上传共享文档</div>
-                    <div class="oneedi">
-                      <a-switch v-model:checked="docChecked" ></a-switch>
+                  <div class="edit" @click="toEdit">
+                    <div class="img"></div>
+                    <div class="ed">编辑</div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目名称：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ name }}</span>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>封面图：</span></div>
+                    <div class="setc_main">
+                      <img
+                        style="width: 151px; height: 84px"
+                        :src="picUrl"
+                        alt=""
+                      />
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目时间：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999"
+                        >{{ startTime }} ～ {{ endTime }}</span
+                      >
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目经理：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ manager }}</span>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>资源归属：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ sourceBelong }}</span>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ remark }}</span>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedSty"
+                        ><span style="color: #333333"
+                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                        ></a-radio
+                      >
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目级别：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ level }}</span>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>培训体系：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ systemId }}</span>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>是否BOEU实施：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedBOEU"
+                        ><span style="color: #333333">BOEU实施</span></a-radio
+                      >
                     </div>
                   </div>
-                  <div class="btnbox" style="margin:20px;">
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  action="/api/file/upload"
-                  @change="handleChange"
-                >
-                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
-                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
-                  width:34px;height:34px;
-                  " alt="">
-                </a-upload>
-                <div class="btnbox" style="margin:20px;">
-                <span style="color: #999999">
-                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
-                </span>
-              </div>
-              <div v-for="item in docList" :key="item.src" class="docListStyle">
-                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
-                  width:40px;height:40px;margin-right:40px;
-                  " alt="">
-                <span style="font: oblique bold  16px Sans-serif">{{item.name}}</span> 
-                <span style="color: #4ea6ff;float:right;">删除</span>
-              </div>
-              </div>
                 </div>
               </div>
-            </div>
-          </a-tab-pane>
+            </a-tab-pane>
+            <a-tab-pane key="13" tab="共享文档">
+              <div class="sametab">
+                <div class="Gcon">
+                  <div class="pad"></div>
+                  <div class="Gin">
+                    <div class="headone">
+                      <div class="box"></div>
+                      <div class="onetitle">上传共享文档</div>
+                      <div class="oneedi">
+                        <a-switch v-model:checked="docChecked"></a-switch>
+                      </div>
+                    </div>
+                    <div class="btnbox" style="margin: 20px">
+                      <a-upload
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/api/file/upload"
+                        @change="handleChange"
+                      >
+                        <span
+                          class="xkbtn"
+                          style="cursor: pointer; font-size: 17px"
+                          >上传</span
+                        >
+                        <img
+                          src="@/assets/images/basicinfo/cloud.png"
+                          style="cursor: pointer; width: 34px; height: 34px"
+                          alt=""
+                        />
+                      </a-upload>
+                      <div class="btnbox" style="margin: 20px">
+                        <span style="color: #999999">
+                          支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                        </span>
+                      </div>
+                      <div
+                        v-for="item in docList"
+                        :key="item.src"
+                        class="docListStyle"
+                      >
+                        <img
+                          src="@/assets/images/basicinfo/download.png"
+                          style="
+                            cursor: pointer;
+                            width: 40px;
+                            height: 40px;
+                            margin-right: 40px;
+                          "
+                          alt=""
+                        />
+                        <span style="font: oblique bold 16px Sans-serif">{{
+                          item.name
+                        }}</span>
+                        <span style="color: #4ea6ff; float: right">删除</span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
@@ -1455,6 +1494,7 @@
 <script>
 import { reactive, toRefs, onMounted } from "vue";
 import { useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
@@ -1515,6 +1555,9 @@ export default {
       projectId: storage.get("projectId")
         ? JSON.parse(storage.get("projectId"))
         : null,
+      isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
+      // pN: storage.get("pN") ? JSON.parse(storage.get("pN")) : null,
+      pN: storage.get("pN"),
       goodstuList: [
         {
           id: 1,
@@ -1540,22 +1583,22 @@ export default {
         },
       ],
       changeGoods: [], //更改是否优秀的id数组
-      choosedStageId:1, // 选择的阶段id
-      activeSetKey:"12",//12-基础信息 13-共享文档
-      docChecked:true,
-      docList:[
+      choosedStageId: 1, // 选择的阶段id
+      activeSetKey: "12", //12-基础信息 13-共享文档
+      docChecked: true,
+      docList: [
         {
-          name:'测试文档1.doc',
-          src:"",
+          name: "测试文档1.doc",
+          src: "",
         },
         {
-          name:'测试文档2.doc',
-          src:"",
+          name: "测试文档2.doc",
+          src: "",
         },
         {
-          name:'测试文档3.doc',
-          src:"",
-        }
+          name: "测试文档3.doc",
+          src: "",
+        },
       ],
       //学员信息列表
       tabledata: [
@@ -2122,6 +2165,7 @@ export default {
       level: null, //项目级别
       systemId: null, //培训体系
       picUrl: null,
+      parentId: null,
     });
 
     const levelList = reactive({
@@ -2158,6 +2202,7 @@ export default {
     // 输入接入 -- start --
 
     const router = useRoute();
+    const routered = useRouter();
     console.log("route:", router.query.id);
 
     // 输入接入 -- start --
@@ -2921,7 +2966,7 @@ export default {
         let info = res.data.data.projectInfo;
         let start = toDate(info.beginTime / 1000, "Y-M-D");
         let end = toDate(info.endTime / 1000, "Y-M-D");
-
+        state.parentId = info.parentId;
         state.name = info.name;
         state.startTime = start;
         state.endTime = end;
@@ -3036,7 +3081,7 @@ export default {
     //start---------项目概览
     // 获取项目概览
     const getOverview = () => {
-      overview({projectId:state.projectId})
+      overview({ projectId: state.projectId })
         .then((res) => {
           Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
             levelList.projectInfoOverview[item] =
@@ -3071,6 +3116,40 @@ export default {
         message.error(`${info.file.name} 文件上传失败.`);
       }
     };
+
+    //设置里的编辑按钮
+    const toEdit = () => {
+      if (state.parentId == "0") {
+        routered.push({
+          path: "/projectadd",
+          query: {
+            projectId: state.projectId,
+            name: state.name,
+          },
+        });
+      } else {
+        if (state.isbj !== null) {
+          routered.push({
+            path: "/classadd",
+            query: {
+              projectId: state.projectId,
+              // name: state.paraentName,
+              name: state.pN,
+              edit: 0,
+            },
+          });
+        } else {
+          routered.push({
+            path: "/sonproject",
+            query: {
+              projectId: state.projectId,
+              name: state.name,
+              edit: 0,
+            },
+          });
+        }
+      }
+    };
     onMounted(() => {
       getStu();
       getTaskList();
@@ -3154,6 +3233,7 @@ export default {
       cancelcanyou,
       changePaginationStu,
       handleChange,
+      toEdit,
     };
   },
 };
@@ -5318,12 +5398,12 @@ export default {
   }
   //设置的共享文档
   .sametab {
-      // margin-left: 30px;
-      // margin-right: 30px;
-      margin-top: 30px;
-      width: 100%;
-      // background-color: green;
-      .Gcon {
+    // margin-left: 30px;
+    // margin-right: 30px;
+    margin-top: 30px;
+    width: 100%;
+    // background-color: green;
+    .Gcon {
       display: flex;
       .pad {
         height: 100%;
@@ -5475,264 +5555,264 @@ export default {
         }
       }
     }
-      .Lhead {
+    .Lhead {
+      display: flex;
+      .btns {
         display: flex;
-        .btns {
-          display: flex;
-          margin-left: 20px;
-          // flex-wrap: wrap;
-          .btn {
-            padding: 0px 26px 0px 26px;
-            height: 38px;
-            background: rgba(64, 158, 255, 0);
-            border-radius: 8px;
-            border: 1px solid rgba(64, 158, 255, 1);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            margin-right: 14px;
-            flex-shrink: 0;
-            cursor: pointer;
-            .search {
-              background-size: 100%;
-            }
-            .btnText {
-              font-size: 14px;
-              font-weight: 400;
-              color: rgba(64, 158, 255, 1);
-              line-height: 36px;
-              margin-left: 5px;
-            }
-          }
-          .btn1 {
-            .search {
-              width: 15px;
-              height: 17px;
-              background-image: url("../../assets/images/courseManage/search1.png");
-            }
-          }
-          .btn2 {
-            .search {
-              width: 16px;
-              height: 18px;
-              background-image: url("../../assets/images/courseManage/reset1.png");
-            }
-          }
-          .btn3 {
-            margin-right: 0px;
-            .search {
-              width: 17px;
-              height: 18px;
-              background-image: url("../../assets/images/courseManage/add1.png");
-            }
-          }
-          .btn1:hover {
-            background: rgba(64, 158, 255, 1);
-            .search {
-              background-image: url("../../assets/images/courseManage/search0.png");
-            }
-            .btnText {
-              color: #ffffff;
-            }
-          }
-          .btn2:hover {
-            background: rgba(64, 158, 255, 1);
-            .search {
-              background-image: url("../../assets/images/courseManage/reset0.png");
-            }
-            .btnText {
-              color: #ffffff;
-            }
-          }
-          .btn3:hover {
-            background: rgba(64, 158, 255, 1);
-            .search {
-              background-image: url("../../assets/images/courseManage/add0.png");
-            }
-            .btnText {
-              color: #ffffff;
-            }
-          }
-        }
-      }
-      .Lbom {
-        position: relative;
-        margin-bottom: 20px;
-        .item {
-          width: 100%;
-          height: 200px;
-          // background-color: green;
-          margin-top: 40px;
+        margin-left: 20px;
+        // flex-wrap: wrap;
+        .btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          background: rgba(64, 158, 255, 0);
           border-radius: 8px;
-          border: 1px solid #f0f4fe;
-          .itemhead {
-            height: 50px;
-            width: 100%;
-            background-color: #f0f4fe;
-            display: flex;
-            align-items: center;
-            position: relative;
-            .lev {
-              margin-left: 27px;
-              margin-right: 16px;
-              line-height: 100%;
-              color: #409eff;
-              font-size: 16px;
-            }
-            .lin {
-              width: 1px;
-              height: 35%;
-              background-color: #c7cbd2;
-            }
-            .nam {
-              margin-left: 16px;
-              color: #4f5156;
-              line-height: 100%;
-              font-size: 16px;
-            }
-            .count {
-              position: absolute;
-              line-height: 100%;
-              color: #4f5156;
-              font-size: 14px;
-              right: 40px;
-              span:nth-child(2) {
-                color: #63ca8c;
-              }
-            }
+          border: 1px solid rgba(64, 158, 255, 1);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          flex-shrink: 0;
+          cursor: pointer;
+          .search {
+            background-size: 100%;
           }
-          .itembomm {
-            display: flex;
-            align-items: center;
-            height: 150px;
-            .it {
-              // margin-left: 110px;
-              // margin-right: 110px;
-              width: 13%;
-              text-align: center;
-              .on {
-                font-size: 30px;
-              }
-              .ittext {
-                color: #4f5156;
-                margin-top: 16px;
-                margin-left: -5px;
-              }
-            }
-            .linee {
-              background-color: #ecf2fb;
-              width: 1px;
-              height: 55%;
-            }
-            .itright {
-              position: absolute;
-              right: 45px;
-              display: flex;
-              .te {
-                color: #4ea6ff;
-                font-size: 14px;
-                cursor: pointer;
-              }
-              .more {
-                position: relative;
-                height: 30px;
-                display: flex;
-                .moreArrow {
-                  width: 13px;
-                  height: 7px;
-                  display: inline-block;
-                  background-image: url("../../assets/images/navtop/down.png");
-                  background-size: 100%;
-                  margin: 2px;
-                  margin-left: 7px;
-                  margin-top: 6px;
-                }
-                .moreItems {
-                  width: 80px;
-                  height: 70px;
-                  display: none;
-                  background: #ffffff;
-                  box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
-                  border-radius: 3px;
-                  border: 0px solid #dcdcdc;
-                  position: absolute;
-                  left: 0px;
-                  top: 20px;
-                  z-index: 100;
-                  .roleItem {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: rgba(79, 81, 86, 1);
-                    line-height: 36px;
-                    display: flex;
-                    justify-content: center;
-                    cursor: pointer;
-                  }
-                  .roleItem:hover {
-                    color: #4ea6ff;
-                  }
-                }
-              }
-              .more:hover .moreArrow {
-                background-image: url("../../assets/images/navtop/up.png");
-              }
-              .more:hover .moreItems {
-                display: block;
-              }
-            }
-          }
-
-          .show {
-            color: blue;
-          }
-          .noshow {
-            display: none;
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            color: rgba(64, 158, 255, 1);
+            line-height: 36px;
+            margin-left: 5px;
           }
         }
-        .create {
-          margin-top: 40px;
-          .taskbox {
-            width: 412px;
-            height: 160px;
-            border-radius: 10px;
-            position: relative;
-            // margin-left: 68px;
-            margin-bottom: 40px;
-            cursor: pointer;
-            .leftt {
-              position: absolute;
-              top: 18px;
-              left: 0;
-            }
-            .photo {
-              position: absolute;
-              top: 42px;
-              left: 37px;
-            }
-            .rightt {
-              position: absolute;
-              top: 69px;
-              right: 26px;
-            }
-            .centerbox {
-              position: absolute;
-              top: 52px;
-              left: 145px;
-              font-size: 20px;
-              font-weight: 700;
-              //line-height: 36px;
-            }
-            .centermain {
-              color: rgba(135, 139, 146, 1);
-              font-size: 14px;
-              position: absolute;
-              left: 144px;
-              bottom: 49px;
-            }
+        .btn1 {
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search1.png");
+          }
+        }
+        .btn2 {
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset1.png");
+          }
+        }
+        .btn3 {
+          margin-right: 0px;
+          .search {
+            width: 17px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/add1.png");
+          }
+        }
+        .btn1:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+          .btnText {
+            color: #ffffff;
+          }
+        }
+        .btn2:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+          .btnText {
+            color: #ffffff;
+          }
+        }
+        .btn3:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/add0.png");
+          }
+          .btnText {
+            color: #ffffff;
           }
         }
       }
     }
+    .Lbom {
+      position: relative;
+      margin-bottom: 20px;
+      .item {
+        width: 100%;
+        height: 200px;
+        // background-color: green;
+        margin-top: 40px;
+        border-radius: 8px;
+        border: 1px solid #f0f4fe;
+        .itemhead {
+          height: 50px;
+          width: 100%;
+          background-color: #f0f4fe;
+          display: flex;
+          align-items: center;
+          position: relative;
+          .lev {
+            margin-left: 27px;
+            margin-right: 16px;
+            line-height: 100%;
+            color: #409eff;
+            font-size: 16px;
+          }
+          .lin {
+            width: 1px;
+            height: 35%;
+            background-color: #c7cbd2;
+          }
+          .nam {
+            margin-left: 16px;
+            color: #4f5156;
+            line-height: 100%;
+            font-size: 16px;
+          }
+          .count {
+            position: absolute;
+            line-height: 100%;
+            color: #4f5156;
+            font-size: 14px;
+            right: 40px;
+            span:nth-child(2) {
+              color: #63ca8c;
+            }
+          }
+        }
+        .itembomm {
+          display: flex;
+          align-items: center;
+          height: 150px;
+          .it {
+            // margin-left: 110px;
+            // margin-right: 110px;
+            width: 13%;
+            text-align: center;
+            .on {
+              font-size: 30px;
+            }
+            .ittext {
+              color: #4f5156;
+              margin-top: 16px;
+              margin-left: -5px;
+            }
+          }
+          .linee {
+            background-color: #ecf2fb;
+            width: 1px;
+            height: 55%;
+          }
+          .itright {
+            position: absolute;
+            right: 45px;
+            display: flex;
+            .te {
+              color: #4ea6ff;
+              font-size: 14px;
+              cursor: pointer;
+            }
+            .more {
+              position: relative;
+              height: 30px;
+              display: flex;
+              .moreArrow {
+                width: 13px;
+                height: 7px;
+                display: inline-block;
+                background-image: url("../../assets/images/navtop/down.png");
+                background-size: 100%;
+                margin: 2px;
+                margin-left: 7px;
+                margin-top: 6px;
+              }
+              .moreItems {
+                width: 80px;
+                height: 70px;
+                display: none;
+                background: #ffffff;
+                box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
+                border-radius: 3px;
+                border: 0px solid #dcdcdc;
+                position: absolute;
+                left: 0px;
+                top: 20px;
+                z-index: 100;
+                .roleItem {
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: rgba(79, 81, 86, 1);
+                  line-height: 36px;
+                  display: flex;
+                  justify-content: center;
+                  cursor: pointer;
+                }
+                .roleItem:hover {
+                  color: #4ea6ff;
+                }
+              }
+            }
+            .more:hover .moreArrow {
+              background-image: url("../../assets/images/navtop/up.png");
+            }
+            .more:hover .moreItems {
+              display: block;
+            }
+          }
+        }
+
+        .show {
+          color: blue;
+        }
+        .noshow {
+          display: none;
+        }
+      }
+      .create {
+        margin-top: 40px;
+        .taskbox {
+          width: 412px;
+          height: 160px;
+          border-radius: 10px;
+          position: relative;
+          // margin-left: 68px;
+          margin-bottom: 40px;
+          cursor: pointer;
+          .leftt {
+            position: absolute;
+            top: 18px;
+            left: 0;
+          }
+          .photo {
+            position: absolute;
+            top: 42px;
+            left: 37px;
+          }
+          .rightt {
+            position: absolute;
+            top: 69px;
+            right: 26px;
+          }
+          .centerbox {
+            position: absolute;
+            top: 52px;
+            left: 145px;
+            font-size: 20px;
+            font-weight: 700;
+            //line-height: 36px;
+          }
+          .centermain {
+            color: rgba(135, 139, 146, 1);
+            font-size: 14px;
+            position: absolute;
+            left: 144px;
+            bottom: 49px;
+          }
+        }
+      }
+    }
+  }
 }
 
 .DelModal {

From 4574d93c960096d66eb061ed1843fdc1a5b848e4 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 14 Nov 2022 21:15:18 +0800
Subject: [PATCH 39/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TwoDimensionalCode.vue        |  270 ++
 src/components/drawers/CorPowerlist.vue      |  907 +++--
 src/components/drawers/CourseOwner.vue       | 2157 +++++++++++
 src/components/drawers/CourseView.vue        | 2157 +++++++++++
 src/components/drawers/OwnPower.vue          | 1820 ++++++---
 src/components/drawers/PowerList.vue         |   34 +-
 src/components/drawers/ProjCheckPower.vue    | 1842 +++++++---
 src/components/drawers/ProjManagePower.vue   | 1844 +++++++---
 src/components/drawers/ProjPowerList.vue     |   33 +-
 src/components/drawers/ProjectOwn.vue        |   18 +-
 src/components/drawers/pathStuAdd.vue        | 3468 ++++++++++--------
 src/views/courselibrary/CoursewareManage.vue |   38 +-
 src/views/projectcenter/SonProject.vue       |    4 +-
 src/views/projectcenter/TaskAdd.vue          |  351 +-
 src/views/system/SystemManage.vue            |   35 +
 15 files changed, 11628 insertions(+), 3350 deletions(-)
 create mode 100644 src/components/TwoDimensionalCode.vue
 create mode 100644 src/components/drawers/CourseOwner.vue
 create mode 100644 src/components/drawers/CourseView.vue

diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
new file mode 100644
index 00000000..4808d440
--- /dev/null
+++ b/src/components/TwoDimensionalCode.vue
@@ -0,0 +1,270 @@
+<template>
+  <div class="twoDimensionalCode">
+    <!--二维码页面 -->
+    <a-modal
+      :visible="codevisible"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="codeModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="qr_exit"
+    >
+      <div id="qrcode" class="QR">
+        <div class="qr_header"></div>
+        <div class="qr_main">
+          <div class="qrm_header">
+            <span style="title">{{codeInfo.title?codeInfo.title:''}}</span>
+            <div class="close_exit" @click="closeCodeModal"></div>
+          </div>
+          <div class="qrm_body">
+            <div class="codename">{{codeInfo.name?codeInfo.name:''}}</div>
+            <qrcode-vue
+              :value="codeInfo.url?codeInfo.url:''"
+              :size="qrcodeSize"
+              style="width: 200px; height: 200px"
+            ></qrcode-vue>
+          </div>
+
+          <div class="qrm_footer">
+            <span style="margin-left: 52px">下载二维码</span>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">200*200</div>
+            </div>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">400*400</div>
+            </div>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">800*800</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!--二维码页面 -->
+  </div>
+</template>
+<script>
+import { reactive, toRefs, watch } from "vue";
+import QrcodeVue from "qrcode.vue";
+// import html2canvas from "html2canvas";
+export default {
+  name: "TwoDimensionalCode",
+  components: {
+    QrcodeVue,
+  },
+  props: {
+    codevisible: {
+      type: Boolean,
+      default: false,
+    },
+    codeInfo: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+     index: {
+      type: String,
+      default: "",
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      qrcodeUrl: "https://www.baidu.com/",
+      qrcodeSize: 800,
+      codeInfo: {},
+    });
+
+    //下载二维码图片
+    const downloadQr = (num) => {
+      state.qrcodeSize = num;
+      // let filename = `${new Date().getTime()}.png`;
+      // let canvas = document.getElementsByTagName("canvas")[0];
+      // let imageUrl = canvas.toDataURL("image/png");
+
+      // let canvasBox = document.createElement("canvas");
+      // let ctx = canvasBox.getContext("2d");
+      // var img = new Image();
+      // // 需要添加文字的图片
+      // img.src = imageUrl;
+      // // 等待图片加载完成
+      // img.onload = function () {
+      //   // 将图片添加到canvas
+      //   ctx.drawImage(img, 0, 0, 1240, 2208);
+      //   // 设置字体
+      //   ctx.font = "73px 微软雅黑 bolder";
+      //   // 设置字体颜色
+      //   ctx.fillStyle = "#955f17";
+      //   ctx.textAlign = "center";
+      //   // 添加文字和位置
+      //   ctx.fillText("微信名", 621, 1050);
+
+      //   // 导出为图片
+      //   let url = canvasBox.toDataURL("image/png");
+      //   let a = document.createElement("a");
+      //   a.style.display = "none";
+      //   a.download = filename;
+      //   a.href = url;
+      //   document.body.appendChild(a);
+      //   a.click();
+      // };
+
+      // // let a = document.createElement("a");
+      // // a.style.display = "none";
+      // // a.download = filename;
+      // // a.href = imageUrl;
+      // // document.body.appendChild(a);
+      // // a.click();
+
+      // html2canvas(document.querySelector("#qrcode"), {
+      //   useCORS: true, //支持图片跨域
+      // }).then((canvas) => {
+      //   // var extra_canvas = document.createElement("canvas");
+      //   //                 extra_canvas.setAttribute('width',num);
+      //   //                 extra_canvas.setAttribute('height',num);
+      //   //                 var ctx = extra_canvas.getContext('2d');
+      //   //                 ctx.drawImage(canvas,0,0,num,num);
+      //   //                 let filename = `${new Date().getTime()}.png`;
+      //   //                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
+
+      //   console.log("canvas", canvas, canvas.width, canvas.style.width);
+
+      //   // //   let ctx = canvas.getContext('2d');
+      //   // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
+      //   // //            canvas.width=num
+      //   // //  canvas.height=num
+      //   // //  canvas.style.width=num+'px'
+      //   // // canvas.style.height=num+'px'
+      //   //   let filename = `${new Date().getTime()}.png`;
+      //   //   let imageUrl = canvas.toDataURL("image/png");
+      //   //   let a = document.createElement("a");
+      //   //   a.style.display = "none";
+      //   //   a.download = filename;
+      //   //   a.href = imageUrl;
+      //   //   document.body.appendChild(a);
+      //   //   a.click();
+      // });
+console.log('document.getElementsByClassName',document.getElementsByClassName('codeModal'),Number(props.index))
+          let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
+          let filename = `${new Date().getTime()}.png`;
+          let imageUrl = canvas.toDataURL("image/png");
+          let a = document.createElement("a");
+          a.style.display = "none";
+          a.download = filename;
+          a.href = imageUrl;
+          document.body.appendChild(a);
+          a.click();
+    };
+    const closeCodeModal = () => {
+      ctx.emit("update:codevisible", false);
+    };
+    watch(() => {
+      let obj = {
+        title: "",
+        name: "",
+        url: "",
+      };
+      state.codeInfo = Object.assign(obj, props.codeInfo);
+      console.log("codeInfo22222", state.codeInfo,props.index);
+    });
+    return {
+      ...toRefs(state),
+      downloadQr,
+      closeCodeModal,
+    };
+  },
+};
+</script>
+<style scoped lang="scss">
+.twoDimensionalCode {
+}
+.codeModal {
+  .ant-modal {
+    .ant-modal-content {
+      width: 479px !important;
+      .ant-modal-body {
+        .QR {
+          z-index: 9999;
+          width: 520px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          position: absolute;
+          left: 50%;
+          top: 10%;
+          transform: translate(-50%, -50%);
+          .qr_header {
+            position: absolute;
+            width: calc(100%);
+            height: 40px;
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+          }
+          .qr_main {
+            width: 100%;
+            position: relative;
+            .qrm_header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+              .title {
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 22px;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .qrm_body {
+              width: 100%;
+              margin-top: 22px;
+              margin-bottom: 32px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              .codename {
+                font-size: 18px;
+                font-weight: 400;
+                color: #333333;
+                line-height: 25px;
+                margin-bottom: 20px;
+              }
+            }
+            .qrm_footer {
+              display: flex;
+              align-items: center;
+              margin-bottom: 44px;
+              .qrmbtn {
+                width: 80px;
+                height: 32px;
+                display: flex;
+                line-height: 32px;
+                justify-content: center;
+                border-radius: 4px;
+                border: 1px solid #387df7;
+                margin-left: 16px;
+                cursor: pointer;
+                .btntext {
+                  color: #387df7;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue
index e972af16..5f442929 100644
--- a/src/components/drawers/CorPowerlist.vue
+++ b/src/components/drawers/CorPowerlist.vue
@@ -8,135 +8,126 @@
       @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 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">
+        <div class="search">
+          <div class="leftchoose">
+            <div class="namecon" style="margin-right: 30px">
+              <div class="name">姓名：</div>
+              <a-input
+                v-model:value="name"
+                style="width: 270px; height: 40px; border-radius: 8px"
+                placeholder="请输入姓名"
+              />
+            </div>
+          </div>
+
+          <div class="btns">
+            <div class="btn btn1" style="margin-right: 20px">
+              <div class="img1"></div>
+              <div class="wz">搜索</div>
+            </div>
+            <div class="btn btn2">
+              <div class="img2"></div>
+              <div class="wz">重置</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="tableBox" style="margin-top: 10px">
+          <a-table
+            style="border: 1px solid #f2f6fe"
+            :columns="tableDataFunc()"
+            :data-source="tableData"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :scroll="{ x: 900 }"
+            :pagination="false"
+           
           />
         </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="inputV1"
-                    style="width: 264px; 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
-                :row-selection="{
-                  selectedRowKeys: selectedRowKeys,
-                  onChange: onSelectChange,
-                }"
-                :columns="columns1"
-                :data-source="tableData1"
-                :loading="tableDataTotal === -1 ? true : false"
-                :pagination="false"
-              >
-                <template #bodyCell="{ column }">
-                  <template v-if="column.key === 'opacation'">
-                    <a>取消授权</a>
-                  </template>
-                </template>
-              </a-table>
-              <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 class="tableBox">
+          <div class="pa">
+            <a-pagination
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+            />
           </div>
         </div>
-        <div class="main_btns">
-          <button class="btn1">取消</button>
-          <button class="btn2">确定</button>
+        <!-- <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
+          <a-table
+            style="border: 1px solid #f2f6fe"
+            :columns="tablecolumns"
+            :data-source="tabledata"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            :scroll="{ x: 900, y: 350 }"
+            @expand="expandTable"
+            :pagination="false"
+            :row-selection="{
+              columnWidth: 30,
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }"
+          />
+        </div> -->
+      </div>
+  <!-- 取消授权弹窗 -->
+    <a-modal
+      v-model:visible="cancelModal"
+      :footer="null"
+      :closable="closeCancel"
+      wrapClassName="copyModal"
+      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="closeCancelModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要取消该用户的授权吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
         </div>
       </div>
+    </a-modal>
+
+        <div class="botm"></div>
+    <div class="btnn">
+      <button class="btn1">取消</button>
+      <button class="btn2">确定</button>
+    </div>
+      </div>
     </a-drawer>
 </template>
   
   <script>
-  import { reactive, toRefs, ref } from "vue";
-  const columns1 = [
-  {
-    title: "姓名",
-    dataIndex: "name",
-    key: "name",
-    width: "10%",
-    align: "left",
-  },
-  {
-    title: "归属组织",
-    dataIndex: "organization",
-    key: "organization",
-    width: "19%",
-    align: "center",
-  },
-  {
-    title: "岗位",
-    dataIndex: "position",
-    key: "position",
-    width: "19%",
-    align: "center",
-  },
-  {
-    title: "拥有权限",
-    dataIndex: "authority",
-    key: "authority",
-    width: "19%",
-    align: "center",
-  },
-  {
-    title: "操作",
-    dataIndex: "opacation",
-    key: "opacation",
-    width: "34%",
-    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);
-    },
-  });
+  import { reactive, toRefs } from "vue";
   export default {
     name: "CorPoerlist",
     props: {
@@ -147,47 +138,98 @@
     },
     setup(props, ctx) {
       const state = reactive({
-        tableData1: [
+         name: null,
+      showmodal: false, //勾选提示框
+      closable: false, //modal右上角的关闭按钮
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 100,
+      selectedRowKeys: [],
+      cancelModal: false, //取消授权弹窗
+      closeCancel: false, //取消授权弹窗关闭图标
+       tableData: [
         {
           key: 1,
-          name: "李明",
-          organization: "-",
-          position: "产品经理",
-          authority: "归属权",
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 2,
-          name: "李洋",
-          organization: "-",
-          position: "产品经理",
-          authority: "查看权",
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 3,
-          name: "小李",
-          organization: "-",
-          position: "产品经理",
-          authority: "管理权",
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 4,
-          name: "雄安名",
-          organization: "-",
-          position: "产品经理",
-          authority: "管理权",
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 5,
-          name: "王哥",
-          organization: "-",
-          position: "产品经理",
-          authority: "管理权",
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
+        },
+        {
+          key: 6,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "归属权",
+        },
+        {
+          key: 7,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "查看权",
+        },
+        {
+          key: 8,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
+        },
+        {
+          key: 9,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
+        },
+        {
+          key: 10,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
         },
       ],
-        currentPage: 1,
-        tableDataTotal: 100,
-        pageSize: 10,
-        inputV1:'',
+      
       });
       const closeDrawer = () => {
         ctx.emit("update:corpowerlistVisible", false);
@@ -195,12 +237,104 @@
       const afterVisibleChange = (bool) => {
         console.log("state", bool);
       };
+        const onSelectChange = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+    };
+    const showCancelModal = () => {
+      state.cancelModal = true;
+    };
+    const closeCancelModal = () => {
+      state.cancelModal = false;
+    };
+
+        const tableDataFunc = () => {
+      const columns = [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: 70,
+          align: "left",
+          className: "classify",
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {text.record.name}</span>
+              </div>
+            );
+          },
+        },
+         {
+          title: "工号",
+          dataIndex: "number",
+          // width: "30%",
+          key: "number",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "com",
+          // width: "30%",
+          key: "com",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "所在岗位",
+          dataIndex: "gang",
+          key: "gang",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "拥有权限",
+          dataIndex: "state",
+          key: "state",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "操作",
+          className: "h",
+          dataIndex: "opacation",
+          key: "opacation",
+          width: 100,
+          align: "center",
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: () => {
+            return (
+              <div
+                class="opa"
+                onClick={() => {
+                  showCancelModal();
+                }}
+              >
+                取消授权
+              </div>
+            );
+          },
+        },
+      ];
+      return columns;
+    };
       return {
         ...toRefs(state),
-        afterVisibleChange,
         closeDrawer,
-        columns1,
-        rowSelection,
+      onSelectChange,
+      tableDataFunc,
+      showCancelModal,
+      closeCancelModal,
+      afterVisibleChange,
       };
     },
   };
@@ -209,182 +343,339 @@
   // .ant-table-striped :deep(.table-striped) td {
   //   background-color: #fafafa !important;
   // }
-  
-  .corpowerlistDrawer {
-    .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;
-          background-color: #ffffff;
-        }
-      }
-      .contentMain {
-        margin-top: 32px;
-        padding-right: 20px;
-        .main_items {
-          display: flex;
-          justify-content: space-between;
-          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;
-              }
-            }
+  .copyModal {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+        .delete {
+          z-index: 999;
+          width: 424px;
+          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%
+            );
           }
-          .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);
+          .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/coursewareManage/notice.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;
-              margin-left: 14px;
-              flex-shrink: 0;
-              .search {
-                background-size: 100%;
-              }
-              .btnText {
-                font-size: 14px;
+              align-items: center;
+              flex-direction: column;
+              // background-color: red;
+              position: relative;
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
                 font-weight: 400;
-                line-height: 36px;
-                margin-left: 5px;
+                color: #666666;
               }
             }
-            .btn1 {
-              background: rgb(64, 158, 255);
-              .search {
-                width: 15px;
-                height: 17px;
-                background-image: url("@/assets/images/coursewareManage/search0.png");
+            .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;
+                }
               }
-              .btnText {
-                color: rgb(255, 255, 255);
+              .btn1 {
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+                margin-right: 14px;
               }
-            }
-            .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 {
+              .btn2 {
+                background-color: #4ea6ff;
                 color: #ffffff;
               }
             }
           }
         }
-        .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;
-            }
-            .tableBox{
-              .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;
-        }
       }
     }
   }
+}
+  .corpowerlistDrawer {
+    // width: 80%;
+  .ant-drawer-content-wrapper {
+    // max-width: 1000px;
+    .ant-drawer-header {
+      display: none !important;
+    }
+    .ant-drawer-body {
+      padding: 0;
+    }
+  }
+  .drawerMain {
+    // overflow: auto;
+    min-width: 500px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      width: 100%;
+      // height: 100%;
+      // background-color: #bfa;
+      overflow-y: auto;
+      margin-bottom: 80px;
+      .search {
+        width: 100%;
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 10px;
+        //justify-content: space-between;
+        .leftchoose {
+          display: flex;
+          margin-right: 20px;
+          .namecon {
+            display: flex;
+            flex-wrap: nowrap;
+            margin-bottom: 10px;
+            .name {
+              margin-top: 8px;
+              white-space: nowrap;
+            }
+            // .name {
+            //   margin-top: 8px;
+
+            //   color: rgba(0, 0, 0, 0.85);
+            //   font-size: 14px;
+            //   font-weight: 400;
+            // }
+          }
+        }
+
+        .btns {
+          display: flex;
+          flex-wrap: nowrap;
+
+          .btn {
+            cursor: pointer;
+            width: 100px;
+            height: 40px;
+            border-radius: 8px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .img1 {
+              width: 15px;
+              height: 17px;
+              background-image: url(../../assets/images/courseManage/search0.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+            .img2 {
+              width: 16px;
+              height: 18px;
+              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+          }
+
+          .btn1 {
+            background: #409eff;
+
+            color: #ffffff;
+          }
+          .btn2 {
+            background: #ffffff;
+
+            color: #409eff;
+            border: 1px solid #409eff;
+          }
+        }
+      }
+
+      .tableBox {
+        // margin-bottom: 80px;
+
+        .classify {
+          // margin-left: 11px !important;
+          // padding-left: 9px !important;
+          padding-left: 20px !important;
+        }
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -2px;
+        }
+        .ant-table-selection-column {
+          padding: 0px !important;
+          // padding-left: 45px !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;
+        }
+        .opa {
+          // background-color: #bfa;
+          font-size: 14px;
+          font-weight: 400;
+          color: #388be1;
+          cursor: pointer;
+        }
+      }
+      .tableBox {
+        .pa {
+          // left: 0;
+          margin-top: 25px;
+          // margin-bottom: 70px;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: center;
+          // position: absolute;
+          // bottom: 20px;
+          // margin-bottom: 20px;
+          .ant-pagination-prev,
+          .ant-pagination-next,
+          .ant-pagination-options {
+            margin-bottom: 10px;
+          }
+          .ant-pagination-item {
+            margin-bottom: 10px;
+          }
+        }
+      }
+      // .tab {
+      //   .ant-table-thead > tr > th {
+      //     background-color: rgba(239, 244, 252, 1) !important;
+      //   }
+
+      //   th.h {
+      //     background-color: #eff4fc !important;
+      //   }
+
+      //   .ant-table-tbody
+      //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      //     > td {
+      //     background: #f6f9fd;
+      //   }
+      // }
+    }
+  }
+  // .botm {
+  //   width: 100%;
+  //   height: 200px;
+  //   background-color: red;
+
+  // }
+  .btnn {
+    height: 72px;
+    width: 100%;
+    position: absolute;
+    background-color: #fff;
+    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: #409eff;
+      border-radius: 8px;
+      border: 0;
+      margin-left: 15px;
+      color: #fff;
+    }
+  }
+  }
   </style>
\ No newline at end of file
diff --git a/src/components/drawers/CourseOwner.vue b/src/components/drawers/CourseOwner.vue
new file mode 100644
index 00000000..ab3c53f8
--- /dev/null
+++ b/src/components/drawers/CourseOwner.vue
@@ -0,0 +1,2157 @@
+<template>
+  <a-drawer
+    :visible="courseownervisible"
+    class="drawerStyle courseOwner"
+    placement="right"
+    width="85%"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain" id="courseOwner">
+      <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">
+        <div class="left">
+          <div class="tabs">
+            <a-tabs v-model:activeKey="activeKey">
+              <a-tab-pane key="1" tab="快速选人">
+                <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="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>
+                  <!-- <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="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: '600px',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                        @select="departmentSelect"
+                        v-model:selectedKeys="selectedKeys"
+                      >
+                        <template #suffixIcon></template>
+                      </a-tree>
+                    </div>
+                    <div class="tableBox tabb" style="margin-top: 16px">
+                      <a-table
+                        style="border: 1px solid #f2f6fe"
+                        :columns="tablecolumns"
+                        :data-source="tabledata"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        expandRowByClick="true"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
+                        }"
+                      />
+                      <div class="pa">
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize"
+                          v-model:current="currentPage"
+                          :total="tableDataTotal"
+                          :pagination="false"
+                          class="pagination"
+                          v-if="tableDataTotal > 10"
+                          @change="changePagination"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
+                    <div class="nameinp">
+                      <div class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
+                      </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="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                        v-if="tabledata2 > 10"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+            </a-tabs>
+          </div>
+        </div>
+        <div class="right">
+          <div class="onerow">
+            <div class="onleft">
+              <div class="already">已选</div>
+              <!-- <div class="count">6</div>
+              <div class="peo">人</div> -->
+            </div>
+            <div class="clbox" @click="deleteAll">
+              <div class="colose"></div>
+              <span class="allclear">全部清除</span>
+            </div>
+          </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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
+        <button class="btn1">取消</button>
+        <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";
+import { toDate } from "../../api/method";
+export default {
+  name: "CourseOwner",
+  props: {
+    courseownervisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 50,
+      pageSize1: 10,
+      currentPage1: 1,
+      tableDataTotal1: 50,
+      pageSize2: 10,
+      currentPage2: 1,
+      tableDataTotal2: 50,
+
+      selectedRowKeys1: [],
+
+      activeKey: "1",
+      value: [], //级联选择框
+      choosevalue: null, //受众选择
+      valueSelect: null, //树形选择
+
+      valueSelectboe2: null, //boe树形选择
+      name: "",
+      nameadd: "",
+      nameaddd: "",
+      com: "",
+      //组织树
+      treeData: [
+        {
+          title: "京东方",
+          value: "京东方",
+          children: [
+            {
+              title: "产研部",
+              value: "产研部",
+              children: [
+                {
+                  title: "产品部",
+                  value: "产品部",
+                },
+                {
+                  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",
+                },
+              ],
+            },
+            {
+              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: "行政部",
+                  value: "行政部",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      //快速选人的table
+      tabledata: [
+        {
+          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: "产品部",
+        },
+        {
+          key: 10,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 11,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 12,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+      ],
+      tablecolumns: [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          key: "name",
+          // width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "工号",
+          dataIndex: "numb",
+          key: "numb",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "guishu",
+          key: "guishu",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+      ],
+
+      //受众关联table数据
+      tabledata2: [
+        {
+          key: 1,
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 2,
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
+        },
+        {
+          key: 3,
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 4,
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
+        },
+        {
+          key: 5,
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
+        },
+        {
+          key: 6,
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 7,
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 8,
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
+        },
+        {
+          key: 9,
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
+        },
+      ],
+      tablecolumns2: [
+        {
+          title: "受众名称",
+          dataIndex: "name",
+          key: "name",
+          width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          width: 35,
+          align: "center",
+          className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
+        },
+        {
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
+          width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
+          width: 40,
+          align: "center",
+          className: "h",
+        },
+      ],
+      organizeList1: [
+        {
+          value: "产品受众群体",
+          label: "产品受众群体",
+        },
+        {
+          value: "人力资源hrbp",
+          label: "人力资源hrbp",
+        },
+      ],
+      //快速选人-------------------------------------
+      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";
+      ctx.emit("update:courseownervisible", false);
+    };
+
+
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    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 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("courseOwner").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("courseOwner")
+        .querySelector("#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("courseOwner").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("courseOwner")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("courseOwner")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("courseOwner").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("courseOwner")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("courseOwner")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("courseOwner")
+        .querySelector("#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,
+      onSelectChange2,
+      // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      departmentSelect1,
+      addOrgModal,
+      addOrg,
+      closeOrgModal,
+      selectedsHeight1,
+      morePeopleShow1,
+      morePeopleHidden1,
+      deleteChoosePeople1,
+
+      selectedsHeight2,
+      morePeopleShow2,
+      morePeopleHidden2,
+      deleteChoosePeople2,
+
+      deleteAll,
+
+      searchOrg,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.courseOwner {
+ .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;
+      display: flex;
+      flex-shrink: 0;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      display: flex;
+      //  min-width: 1200px;
+      //height: 80%;
+      margin-bottom: 72px;
+      overflow-y: auto;
+      //  overflow-x: auto;
+      .left {
+        // overflow-y: auto;
+        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;
+            align-items: center;
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+              }
+            }
+            .btns {
+              display: flex;
+              margin-top: 10px;
+              margin-left: 34px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+          }
+          .btns {
+            display: flex;
+            margin-top: 10px;
+            .btn1 {
+              width: 100px;
+              height: 40px;
+              margin-right: 16px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #ffffff;
+              font-size: 14px;
+              background: #409eff;
+              border-radius: 8px;
+              border: 1px solid #409eff;
+              cursor: pointer;
+              .wz {
+                margin-left: 10px;
+              }
+            }
+            .btn2 {
+              width: 100px;
+              height: 40px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #409eff;
+              font-size: 14px;
+              background: #ffffff;
+              border-radius: 8px;
+              cursor: pointer;
+              border: 1px solid #409eff;
+              .wz {
+                margin-left: 10px;
+              }
+            }
+          }
+          .line {
+            width: 100%;
+            height: 40px;
+            background-color: #e9f6fe;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            border: 1px solid #c3e6fc;
+
+            .inline {
+              width: 95%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+
+              // background-color: #bfa;
+              .left1 {
+                height: 100%;
+                display: flex;
+                align-items: center;
+
+                .img {
+                  width: 14px;
+                  height: 15px;
+                  background-image: url(../../assets/images/leveladd/gan.png);
+                  background-size: 100% 100%;
+                }
+
+                .text {
+                  color: #999ba3;
+                }
+
+                .text2 {
+                  color: #4ea6ff;
+                  margin-left: 5px;
+                  margin-right: 5px;
+                }
+
+                .text3 {
+                  color: #999ba3;
+                  margin-left: 20px;
+                }
+              }
+
+              .right1 {
+                font-size: 14px;
+                font-weight: 400;
+                color: #387df7;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                cursor: pointer;
+              }
+            }
+          }
+          .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;
+                }
+              }
+            }
+          }
+
+          .tab2 {
+            display: flex;
+            align-items: center;
+            // margin-top: 10px;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+              }
+            }
+
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
+            .btns {
+              display: flex;
+              // margin-top: -10px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+            .organize {
+              color: rgba(0, 0, 0, 0.85);
+              font-size: 14px;
+              white-space: nowrap;
+            }
+
+            .ant-select-dropdown {
+              min-width: 800px !important;
+            }
+            .ant-select {
+              border-radius: 8px !important;
+              // background-color: red;
+            }
+            .ant-cascader {
+              width: 264px;
+              height: 40px;
+              border-radius: 8px !important;
+              .ant-select-selector {
+                height: 100%;
+              }
+              .ant-select-selection-search-input {
+                height: 40px;
+              }
+            }
+          }
+          .boeTree {
+            .boeTreeTitle {
+              width: 280px;
+              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: 320px;
+        flex-shrink: 0;
+        overflow-y: auto;
+        .onerow {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-right: 40px;
+          flex-wrap: wrap;
+          .onleft {
+            display: flex;
+            text-align: center;
+            .already {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+              margin-left: 32px;
+              white-space: nowrap;
+              // margin-bottom: 20px;
+            }
+            .count {
+              color: #388be1;
+              font-size: 16px;
+              margin: 0 6px;
+            }
+            .peo {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+            }
+          }
+          .clbox {
+            margin-left: 30px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            cursor: pointer;
+            width: 104px;
+            height: 32px;
+            border-radius: 4px;
+            background: #409eff;
+            .colose {
+              width: 16px;
+              height: 16px;
+              // border-radius: 8px;
+              // background: #ffffff;
+              // position: relative;
+              background-image: url(../../assets/images/basicinfo/ch.png);
+              background-size: 100%;
+              margin-right: 4px;
+            }
+            .allclear {
+              color: rgba(255, 255, 255, 1);
+              font-size: 14px;
+            }
+          }
+        }
+        .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;
+            padding-left: 10px;
+            padding-right: 10px;
+            height: 24px;
+            margin-top: 25px;
+            margin-right: 25px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 2px;
+            border: 1px solid rgba(56, 139, 225, 1);
+            color: rgba(56, 139, 225, 1);
+            font-size: 12px;
+            position: relative;
+            .ch {
+              position: absolute;
+              width: 18px;
+              height: 18px;
+              background-image: url(../../assets/images/basicinfo/ch.png);
+              right: -8px;
+              top: -8px;
+            }
+          }
+        }
+      }
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      background-color: #fff;
+      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: #409eff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+.changetreedropdown {
+  width: 500px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
+
+.changetreedropdownboe {
+  width: 240px !important;
+  border-radius: 5px;
+  min-height: 600px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
+.confirmAddOrg {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+        .delete {
+          z-index: 999;
+          width: 424px;
+          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/CourseView.vue b/src/components/drawers/CourseView.vue
new file mode 100644
index 00000000..198d192a
--- /dev/null
+++ b/src/components/drawers/CourseView.vue
@@ -0,0 +1,2157 @@
+<template>
+  <a-drawer
+    :visible="courseviewvisible"
+    class="drawerStyle courseView"
+    placement="right"
+    width="85%"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain" id="courseView">
+      <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">
+        <div class="left">
+          <div class="tabs">
+            <a-tabs v-model:activeKey="activeKey">
+              <a-tab-pane key="1" tab="快速选人">
+                <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="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>
+                  <!-- <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="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: '600px',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                        @select="departmentSelect"
+                        v-model:selectedKeys="selectedKeys"
+                      >
+                        <template #suffixIcon></template>
+                      </a-tree>
+                    </div>
+                    <div class="tableBox tabb" style="margin-top: 16px">
+                      <a-table
+                        style="border: 1px solid #f2f6fe"
+                        :columns="tablecolumns"
+                        :data-source="tabledata"
+                        :loading="tableDataTotal === -1 ? true : false"
+                        expandRowByClick="true"
+                        @expand="expandTable"
+                        :pagination="false"
+                        :row-selection="{
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
+                        }"
+                      />
+                      <div class="pa">
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize"
+                          v-model:current="currentPage"
+                          :total="tableDataTotal"
+                          :pagination="false"
+                          class="pagination"
+                          v-if="tableDataTotal > 10"
+                          @change="changePagination"
+                        />
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
+                    <div class="nameinp">
+                      <div class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
+                      </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="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                        v-if="tabledata2 > 10"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+            </a-tabs>
+          </div>
+        </div>
+        <div class="right">
+          <div class="onerow">
+            <div class="onleft">
+              <div class="already">已选</div>
+              <!-- <div class="count">6</div>
+              <div class="peo">人</div> -->
+            </div>
+            <div class="clbox" @click="deleteAll">
+              <div class="colose"></div>
+              <span class="allclear">全部清除</span>
+            </div>
+          </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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
+        <button class="btn1">取消</button>
+        <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";
+import { toDate } from "../../api/method";
+export default {
+  name: "CourseView",
+  props: {
+    courseviewvisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 50,
+      pageSize1: 10,
+      currentPage1: 1,
+      tableDataTotal1: 50,
+      pageSize2: 10,
+      currentPage2: 1,
+      tableDataTotal2: 50,
+
+      selectedRowKeys1: [],
+
+      activeKey: "1",
+      value: [], //级联选择框
+      choosevalue: null, //受众选择
+      valueSelect: null, //树形选择
+
+      valueSelectboe2: null, //boe树形选择
+      name: "",
+      nameadd: "",
+      nameaddd: "",
+      com: "",
+      //组织树
+      treeData: [
+        {
+          title: "京东方",
+          value: "京东方",
+          children: [
+            {
+              title: "产研部",
+              value: "产研部",
+              children: [
+                {
+                  title: "产品部",
+                  value: "产品部",
+                },
+                {
+                  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",
+                },
+              ],
+            },
+            {
+              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: "行政部",
+                  value: "行政部",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      //快速选人的table
+      tabledata: [
+        {
+          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: "产品部",
+        },
+        {
+          key: 10,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 11,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 12,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+      ],
+      tablecolumns: [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          key: "name",
+          // width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "工号",
+          dataIndex: "numb",
+          key: "numb",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "guishu",
+          key: "guishu",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+      ],
+
+      //受众关联table数据
+      tabledata2: [
+        {
+          key: 1,
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 2,
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
+        },
+        {
+          key: 3,
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 4,
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
+        },
+        {
+          key: 5,
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
+        },
+        {
+          key: 6,
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 7,
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 8,
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
+        },
+        {
+          key: 9,
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
+        },
+      ],
+      tablecolumns2: [
+        {
+          title: "受众名称",
+          dataIndex: "name",
+          key: "name",
+          width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          width: 35,
+          align: "center",
+          className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
+        },
+        {
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
+          width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
+          width: 40,
+          align: "center",
+          className: "h",
+        },
+      ],
+      organizeList1: [
+        {
+          value: "产品受众群体",
+          label: "产品受众群体",
+        },
+        {
+          value: "人力资源hrbp",
+          label: "人力资源hrbp",
+        },
+      ],
+      //快速选人-------------------------------------
+      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";
+      ctx.emit("update:courseviewvisible", false);
+    };
+
+
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    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 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("courseView").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("courseView")
+        .querySelector("#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("courseView").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("courseView")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("courseView")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("courseView").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("courseView")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("courseView")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("courseView")
+        .querySelector("#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,
+      onSelectChange2,
+      // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      departmentSelect1,
+      addOrgModal,
+      addOrg,
+      closeOrgModal,
+      selectedsHeight1,
+      morePeopleShow1,
+      morePeopleHidden1,
+      deleteChoosePeople1,
+
+      selectedsHeight2,
+      morePeopleShow2,
+      morePeopleHidden2,
+      deleteChoosePeople2,
+
+      deleteAll,
+
+      searchOrg,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.courseView {
+ .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;
+      display: flex;
+      flex-shrink: 0;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      display: flex;
+      //  min-width: 1200px;
+      //height: 80%;
+      margin-bottom: 72px;
+      overflow-y: auto;
+      //  overflow-x: auto;
+      .left {
+        // overflow-y: auto;
+        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;
+            align-items: center;
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+              }
+            }
+            .btns {
+              display: flex;
+              margin-top: 10px;
+              margin-left: 34px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+          }
+          .btns {
+            display: flex;
+            margin-top: 10px;
+            .btn1 {
+              width: 100px;
+              height: 40px;
+              margin-right: 16px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #ffffff;
+              font-size: 14px;
+              background: #409eff;
+              border-radius: 8px;
+              border: 1px solid #409eff;
+              cursor: pointer;
+              .wz {
+                margin-left: 10px;
+              }
+            }
+            .btn2 {
+              width: 100px;
+              height: 40px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #409eff;
+              font-size: 14px;
+              background: #ffffff;
+              border-radius: 8px;
+              cursor: pointer;
+              border: 1px solid #409eff;
+              .wz {
+                margin-left: 10px;
+              }
+            }
+          }
+          .line {
+            width: 100%;
+            height: 40px;
+            background-color: #e9f6fe;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            border: 1px solid #c3e6fc;
+
+            .inline {
+              width: 95%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+
+              // background-color: #bfa;
+              .left1 {
+                height: 100%;
+                display: flex;
+                align-items: center;
+
+                .img {
+                  width: 14px;
+                  height: 15px;
+                  background-image: url(../../assets/images/leveladd/gan.png);
+                  background-size: 100% 100%;
+                }
+
+                .text {
+                  color: #999ba3;
+                }
+
+                .text2 {
+                  color: #4ea6ff;
+                  margin-left: 5px;
+                  margin-right: 5px;
+                }
+
+                .text3 {
+                  color: #999ba3;
+                  margin-left: 20px;
+                }
+              }
+
+              .right1 {
+                font-size: 14px;
+                font-weight: 400;
+                color: #387df7;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                cursor: pointer;
+              }
+            }
+          }
+          .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;
+                }
+              }
+            }
+          }
+
+          .tab2 {
+            display: flex;
+            align-items: center;
+            // margin-top: 10px;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+              }
+            }
+
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
+            .btns {
+              display: flex;
+              // margin-top: -10px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+            .organize {
+              color: rgba(0, 0, 0, 0.85);
+              font-size: 14px;
+              white-space: nowrap;
+            }
+
+            .ant-select-dropdown {
+              min-width: 800px !important;
+            }
+            .ant-select {
+              border-radius: 8px !important;
+              // background-color: red;
+            }
+            .ant-cascader {
+              width: 264px;
+              height: 40px;
+              border-radius: 8px !important;
+              .ant-select-selector {
+                height: 100%;
+              }
+              .ant-select-selection-search-input {
+                height: 40px;
+              }
+            }
+          }
+          .boeTree {
+            .boeTreeTitle {
+              width: 280px;
+              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: 320px;
+        flex-shrink: 0;
+        overflow-y: auto;
+        .onerow {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-right: 40px;
+          flex-wrap: wrap;
+          .onleft {
+            display: flex;
+            text-align: center;
+            .already {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+              margin-left: 32px;
+              white-space: nowrap;
+              // margin-bottom: 20px;
+            }
+            .count {
+              color: #388be1;
+              font-size: 16px;
+              margin: 0 6px;
+            }
+            .peo {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+            }
+          }
+          .clbox {
+            margin-left: 30px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            cursor: pointer;
+            width: 104px;
+            height: 32px;
+            border-radius: 4px;
+            background: #409eff;
+            .colose {
+              width: 16px;
+              height: 16px;
+              // border-radius: 8px;
+              // background: #ffffff;
+              // position: relative;
+              background-image: url(../../assets/images/basicinfo/ch.png);
+              background-size: 100%;
+              margin-right: 4px;
+            }
+            .allclear {
+              color: rgba(255, 255, 255, 1);
+              font-size: 14px;
+            }
+          }
+        }
+        .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;
+            padding-left: 10px;
+            padding-right: 10px;
+            height: 24px;
+            margin-top: 25px;
+            margin-right: 25px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 2px;
+            border: 1px solid rgba(56, 139, 225, 1);
+            color: rgba(56, 139, 225, 1);
+            font-size: 12px;
+            position: relative;
+            .ch {
+              position: absolute;
+              width: 18px;
+              height: 18px;
+              background-image: url(../../assets/images/basicinfo/ch.png);
+              right: -8px;
+              top: -8px;
+            }
+          }
+        }
+      }
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      background-color: #fff;
+      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: #409eff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+.changetreedropdown {
+  width: 500px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
+
+.changetreedropdownboe {
+  width: 240px !important;
+  border-radius: 5px;
+  min-height: 600px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
+.confirmAddOrg {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+        .delete {
+          z-index: 999;
+          width: 424px;
+          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/OwnPower.vue b/src/components/drawers/OwnPower.vue
index f2de47ca..e52e83a2 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -3,10 +3,10 @@
     :visible="ownpowervisible"
     class="drawerStyle ownpower"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="ownpower">
       <div class="header">
         <div class="headerTitle">归属权</div>
         <img
@@ -20,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>
@@ -61,158 +65,182 @@
                     <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">
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
                     <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 class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
                       </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="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -225,24 +253,23 @@
                     <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">
+                  <div class="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -251,6 +278,7 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
+                        v-if="tabledata2 > 10"
                       />
                     </div>
                   </div>
@@ -263,38 +291,197 @@
           <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 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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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 class="chose">
-              李明
-              <div class="ch"></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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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>
@@ -304,11 +491,45 @@
         <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";
+import { toDate } from "../../api/method";
 export default {
   name: "OwnPower",
   props: {
@@ -319,6 +540,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -328,16 +550,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: "京东方",
@@ -355,6 +581,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",
+                },
               ],
             },
             {
@@ -400,6 +658,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:
+                                                                                                "二十级标题二十级标题",
+                                                                                            },
+                                                                                          ],
+                                                                                      },
+                                                                                    ],
+                                                                                },
+                                                                              ],
+                                                                          },
+                                                                        ],
+                                                                    },
+                                                                  ],
+                                                                },
+                                                              ],
+                                                            },
+                                                          ],
+                                                        },
+                                                      ],
                                                     },
                                                   ],
                                                 },
@@ -438,69 +763,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: [
@@ -508,7 +855,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -516,7 +863,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -524,7 +871,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -532,178 +879,88 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
-          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,
+          // width: 30,
           align: "center",
           className: "h",
         },
       ],
+
+      //受众关联table数据
       tabledata2: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
         },
         {
           key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
         },
         {
           key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
         },
       ],
       tablecolumns2: [
         {
-          title: "姓名",
+          title: "受众名称",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -711,25 +968,38 @@ export default {
           className: "h",
         },
         {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
           width: 35,
           align: "center",
           className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
         },
         {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
           width: 30,
           align: "center",
           className: "h",
         },
         {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
           width: 40,
           align: "center",
           className: "h",
@@ -745,36 +1015,413 @@ export default {
           label: "人力资源hrbp",
         },
       ],
+      //快速选人-------------------------------------
+      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";
       ctx.emit("update:ownpowervisible", false);
     };
 
+
     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("ownpower").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("ownpower")
+        .querySelector("#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("ownpower").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("ownpower")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("ownpower")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("ownpower").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ownpower")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("ownpower")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("ownpower")
+        .querySelector("#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),
+     ...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,
+
+      searchOrg,
     };
   },
 };
@@ -782,21 +1429,16 @@ export default {
 
 <style lang="scss">
 .ownpower {
-  // .ant-drawer-content-wrapper {
-  //   // max-width: 1000px;
-  //   .ant-drawer-header {
-  //     display: none !important;
-  //   }
-  //   .ant-drawer-body {
-  //     padding: 0;
-  //   }
-  // }
+ .ant-drawer-content-wrapper {
+    max-width: 1300px !important;
+  }
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: auto;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
+    overflow-x: auto;
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -816,11 +1458,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 {
@@ -828,7 +1474,7 @@ export default {
           .tab1 {
             display: flex;
             flex-wrap: wrap;
-            justify-content: space-between;
+            // justify-content: space-between;
             align-items: center;
             .t1 {
               display: flex;
@@ -847,6 +1493,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -975,35 +1622,97 @@ 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;
-            // }
-            .tableBox {
+              .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;
@@ -1027,45 +1736,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;
@@ -1100,11 +1791,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;
@@ -1159,12 +1926,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;
@@ -1192,6 +1984,7 @@ export default {
       height: 72px;
       width: 100%;
       position: absolute;
+      background-color: #fff;
       bottom: 0;
       left: 0;
       display: flex;
@@ -1211,7 +2004,7 @@ export default {
         cursor: pointer;
         width: 100px;
         height: 40px;
-        background: #4ea6ff;
+        background: #409eff;
         border-radius: 8px;
         border: 0;
         margin-left: 15px;
@@ -1221,13 +2014,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/PowerList.vue b/src/components/drawers/PowerList.vue
index 80466125..20253165 100644
--- a/src/components/drawers/PowerList.vue
+++ b/src/components/drawers/PowerList.vue
@@ -147,13 +147,13 @@ export default {
       selectedRowKeys: [],
       cancelModal: false, //取消授权弹窗
       closeCancel: false, //取消授权弹窗关闭图标
-      tableData: [
+    tableData: [
         {
           key: 1,
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -161,7 +161,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -169,7 +169,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -177,7 +177,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -185,7 +185,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -193,7 +193,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "归属权",
         },
         {
@@ -201,7 +201,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "查看权",
         },
         {
@@ -209,6 +209,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -216,6 +217,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -223,6 +225,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
       ],
@@ -262,6 +265,15 @@ export default {
               </div>
             );
           },
+        },
+         {
+          title: "工号",
+          dataIndex: "number",
+          // width: "30%",
+          key: "number",
+          width: 100,
+          align: "center",
+          className: "h",
         },
         {
           title: "归属组织",
@@ -326,11 +338,7 @@ export default {
 </script>
 
 <style lang="scss">
-.me {
-  .ant-modal-body {
-    padding: 0px;
-  }
-}
+
 .copyModal {
   .ant-modal {
     width: 424px !important;
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index 78ac83f6..40c3f78d 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -4,10 +4,10 @@
     :visible="ProjCheckvisible"
     class="drawerStyle ProjCheckship"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
+    <div class="drawerMain" id="ProjCheckship">
       <div class="header">
         <div class="headerTitle">查看权</div>
         <img
@@ -21,35 +21,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,158 +66,182 @@
                     <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">
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
                     <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 class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
                       </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="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -226,24 +254,23 @@
                     <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">
+                  <div class="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -252,6 +279,7 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
+                        v-if="tabledata2 > 10"
                       />
                     </div>
                   </div>
@@ -264,38 +292,197 @@
           <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 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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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 class="chose">
-              李明
-              <div class="ch"></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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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>
@@ -305,11 +492,45 @@
         <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";
+import { toDate } from "../../api/method";
 export default {
   name: "ProjCheckShip",
   props: {
@@ -320,6 +541,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+     screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -329,16 +551,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 +582,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 +659,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 +764,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 +856,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -517,7 +864,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -525,7 +872,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -533,178 +880,88 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
-          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,
+          // width: 30,
           align: "center",
           className: "h",
         },
       ],
+
+      //受众关联table数据
       tabledata2: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
         },
         {
           key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
         },
         {
           key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
         },
       ],
       tablecolumns2: [
         {
-          title: "姓名",
+          title: "受众名称",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -712,25 +969,38 @@ export default {
           className: "h",
         },
         {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
           width: 35,
           align: "center",
           className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
         },
         {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
           width: 30,
           align: "center",
           className: "h",
         },
         {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
           width: 40,
           align: "center",
           className: "h",
@@ -746,36 +1016,412 @@ export default {
           label: "人力资源hrbp",
         },
       ],
+      //快速选人-------------------------------------
+      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";
       ctx.emit("update:ProjCheckvisible", false);
     };
-
-    const afterVisibleChange = (bool) => {
+ 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);
+    //根据右侧快速选人高度，判断是否显示更多
+    const selectedsHeight = () => {
+      let resize = elementResizeDetectorMaker();
+      resize.listenTo(
+        document.getElementById("ProjCheckship").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#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("ProjCheckship").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("ProjCheckship")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("ProjCheckship")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("ProjCheckship").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ProjCheckship")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("ProjCheckship")
+        .querySelector("#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),
+     ...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,
+
+      searchOrg,
     };
   },
 };
@@ -783,13 +1429,16 @@ export default {
 
 <style lang="scss">
 .ProjCheckship {
+  .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 +1458,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 +1474,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 +1493,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -968,49 +1622,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 +1736,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 +1791,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 +1926,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 +2004,7 @@ export default {
         cursor: pointer;
         width: 100px;
         height: 40px;
-        background: #4ea6ff;
+        background: #409eff;
         border-radius: 8px;
         border: 0;
         margin-left: 15px;
@@ -1213,13 +2014,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/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue
index 949ad4e5..47921661 100644
--- a/src/components/drawers/ProjManagePower.vue
+++ b/src/components/drawers/ProjManagePower.vue
@@ -4,11 +4,11 @@
     :visible="ProjManagevisible"
     class="drawerStyle ProjManageship"
     placement="right"
-    width="60%"
+    width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain">
-      <div class="header">
+    <div class="drawerMain" id="ProjManageship">
+    <div class="header">
         <div class="headerTitle">管理权</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
@@ -21,35 +21,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,158 +66,182 @@
                     <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">
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
                     <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 class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
                       </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="line">
                   <div class="inline">
                     <div class="left1">
                       <div class="img"></div>
@@ -226,24 +254,23 @@
                     <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">
+                  <div class="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -252,6 +279,7 @@
                         :current="currentPage2"
                         :total="tableDataTotal2"
                         class="pagination"
+                        v-if="tabledata2 > 10"
                       />
                     </div>
                   </div>
@@ -264,38 +292,197 @@
           <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 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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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 class="chose">
-              李明
-              <div class="ch"></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">
-              李大明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
-              李二明
-              <div class="ch"></div>
+            <div
+              class="chose"
+              style="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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>
@@ -305,11 +492,45 @@
         <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";
+import { toDate } from "../../api/method";
 export default {
   name: "ProjManageShip",
   props: {
@@ -320,6 +541,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+     screenHeight: document.body.clientHeight, // 屏幕高度
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 50,
@@ -329,16 +551,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 +582,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 +659,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 +764,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 +856,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 30,
+          // width: 30,
           align: "left",
           className: "h",
         },
@@ -517,7 +864,7 @@ export default {
           title: "工号",
           dataIndex: "numb",
           key: "numb",
-          width: 35,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -525,7 +872,7 @@ export default {
           title: "归属组织",
           dataIndex: "guishu",
           key: "guishu",
-          width: 30,
+          // width: 30,
           align: "center",
           className: "h",
         },
@@ -533,178 +880,88 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width: 40,
-          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,
+          // width: 30,
           align: "center",
           className: "h",
         },
       ],
+
+      //受众关联table数据
       tabledata2: [
         {
           key: 1,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 2,
-          name: "小刘",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 3,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 4,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
         },
         {
           key: 5,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
         },
         {
           key: 6,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 7,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
         },
         {
           key: 8,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
         },
         {
           key: 9,
-          name: "小李",
-          bum: "产研部",
-          numb: "000000",
-          guishu: "",
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
         },
       ],
       tablecolumns2: [
         {
-          title: "姓名",
+          title: "受众名称",
           dataIndex: "name",
           key: "name",
           width: 30,
@@ -712,25 +969,38 @@ export default {
           className: "h",
         },
         {
-          title: "工号",
-          dataIndex: "numb",
-          key: "numb",
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
           width: 35,
           align: "center",
           className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
+          },
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
+          },
         },
         {
-          title: "归属组织",
-          dataIndex: "guishu",
-          key: "guishu",
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
           width: 30,
           align: "center",
           className: "h",
         },
         {
-          title: "部门",
-          dataIndex: "bum",
-          key: "bum",
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
           width: 40,
           align: "center",
           className: "h",
@@ -746,36 +1016,412 @@ export default {
           label: "人力资源hrbp",
         },
       ],
+      //快速选人-------------------------------------
+      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";
       ctx.emit("update:ProjManagevisible", false);
     };
 
-    const afterVisibleChange = (bool) => {
+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("ProjManageship").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#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("ProjManageship").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("ProjManageship")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("ProjManageship")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("ProjManageship").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("ProjManageship")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("ProjManageship")
+        .querySelector("#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),
+     ...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,
+
+      searchOrg,
     };
   },
 };
@@ -783,13 +1429,16 @@ export default {
 
 <style lang="scss">
 .ProjManageship {
+  .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 +1458,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 +1474,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 +1493,7 @@ export default {
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -968,49 +1622,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 +1736,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 +1791,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 +1926,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 +2004,7 @@ export default {
         cursor: pointer;
         width: 100px;
         height: 40px;
-        background: #4ea6ff;
+        background: #409eff;
         border-radius: 8px;
         border: 0;
         margin-left: 15px;
@@ -1213,13 +2014,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/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index 8d823919..4f6c1abb 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,7 +50,6 @@
             @expand="expandTable"
             :scroll="{ x: 900 }"
             :pagination="false"
-           
           />
         </div>
         <div class="tableBox">
@@ -153,7 +152,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -161,7 +160,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -169,7 +168,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -177,7 +176,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -185,7 +184,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -193,7 +192,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "归属权",
         },
         {
@@ -201,7 +200,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "查看权",
         },
         {
@@ -209,6 +208,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -216,6 +216,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -223,6 +224,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
       ],
@@ -257,12 +259,21 @@ export default {
           customRender: (text) => {
             // console.log(text.record.checked1);
             return (
-              <div class="racona" >
+              <div class="racona">
                 <span> {text.record.name}</span>
               </div>
             );
           },
         },
+        {
+          title: "工号",
+          dataIndex: "number",
+          // width: "30%",
+          key: "number",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
         {
           title: "归属组织",
           dataIndex: "com",
@@ -376,7 +387,7 @@ export default {
         display: flex;
         flex-wrap: wrap;
         margin-top: 10px;
-        justify-content: space-between;
+        // justify-content: space-between;
         .leftchoose {
           display: flex;
           margin-right: 20px;
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 087332e6..3be12ad0 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -665,31 +665,31 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     const selectedsHeight = () => {
       let resize = elementResizeDetectorMaker();
-      resize.listenTo(document.getElementById('Ownership').querySelector("#selecteds"), function (ele) {
+      resize.listenTo(document.getElementById('ProjOwnership').querySelector("#selecteds"), function (ele) {
         console.log("ele", ele.offsetHeight);
         if (ele.offsetHeight > 160 && !state.showHidden) {
           state.showMore = true;
-          document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
-         document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+          document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
+         document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
         } else if (ele.offsetHeight < 160) {
           state.showMore = false;
           state.showHidden = false;
-         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
-          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+         document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
+          document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
         }
       });
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "";
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------
diff --git a/src/components/drawers/pathStuAdd.vue b/src/components/drawers/pathStuAdd.vue
index 9589bdde..148d9ea7 100644
--- a/src/components/drawers/pathStuAdd.vue
+++ b/src/components/drawers/pathStuAdd.vue
@@ -1,12 +1,12 @@
 <template>
-    <a-drawer
+   <a-drawer
       :visible="Stuvisible"
-      class="drawerStyle stuadd"
+      class="drawerStyle pathstuadd"
       placement="right"
-      width="70%"
+      width="85%"
       @after-visible-change="afterVisibleChange"
     >
-      <div class="drawerMain">
+      <div class="drawerMain" id="pathstuadd" >
         <div class="header">
           <div class="headerTitle">添加学员</div>
           <img
@@ -15,222 +15,23 @@
             @click="closeDrawer"
           />
         </div>
-        <div class="main">
-          <div class="left">
-            <div class="tabs">
-              <a-tabs v-model:activeKey="activeKey">
-                <a-tab-pane key="1" tab="快速选人">
-                  <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="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>
-                    <!-- <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="chooseLeft">
-                      <div class="boeTree">
-                        <a-tree-select
-                          v-model:value="valueSelectboe"
-                          style="width: 240px; border-radius: 4px"
-                          dropdownClassName="changetreedropdownboe"
-                          :dropdown-style="{
-                            maxHeight: '600px',
-                            overflow: 'auto',
-                          }"
-                          placeholder="BOE组织树"
-                          allow-clear
-                          tree-default-expand-all
-                          :tree-data="treeData"
-                        >
-                          <template #suffixIcon></template>
-                        </a-tree-select>
-                      </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"
-                          @expand="expandTable"
-                          :pagination="false"
-                          :row-selection="{
-                            columnWidth: 20,
-                            selectedRowKeys: selectedRowKeys,
-                            onChange: onSelectChange,
-                          }"
-                        />
-                        <div class="pa">
-                          <a-pagination
-                            showSizeChanger="true"
-                            showQuickJumper="true"
-                            hideOnSinglePage="true"
-                            :pageSize="pageSize"
-                            :current="currentPage"
-                            :total="tableDataTotal"
-                            class="pagination"
-                          />
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </a-tab-pane>
-                <a-tab-pane key="2" tab="添加组织" force-render>
-                  <div
-                    :style="{ height: screenHeight - 235 + 'px' }"
-                    style="overflow-y: auto"
-                  >
-                    <div class="tab2">
-                      <div class="nameinp">
-                        <div class="namee">组织：</div>
-                        <a-input
-                          v-model:value="com"
-                          style="width: 230px; 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>
-                        <div class="btn2">
-                          <div class="img2">
-                            <img
-                              src="../../assets/images/courseManage/reset1.png"
-                            />
-                          </div>
-                          <div class="wz">重置</div>
-                        </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="boeTree">
-                      <a-tree-select
-                        v-model:value="valueSelectboe2"
-                        style="width: 240px; border-radius: 4px"
-                        dropdownClassName="changetreedropdownboe"
-                        :dropdown-style="{
-                          maxHeight: '600px',
-                          overflow: 'auto',
-                        }"
-                        placeholder="BOE组织树"
-                        allow-clear
-                        tree-default-expand-all
-                        :tree-data="treeData2"
-                      >
-                        <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>
-                      </div>
-                    </div> -->
-                  </div>
-                </a-tab-pane>
-                <a-tab-pane key="3" tab="受众关联">
-                  <div
-                    :style="{ height: screenHeight - 235 + 'px' }"
-                    style="overflow-y: auto"
-                  >
-                    <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 class="main">
+        <div class="left">
+          <div class="tabs">
+            <a-tabs v-model:activeKey="activeKey">
+              <a-tab-pane key="1" tab="快速选人">
+                <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="btns">
                       <div class="btn1">
@@ -250,33 +51,56 @@
                         <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 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> -->
-                    <div class="tabb" style="margin-top: 16px">
+                    <div class="right1">清空</div>
+                  </div>
+                </div> -->
+                  <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: '600px',
+                        }"
+                        placeholder="BOE组织树"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                        @select="departmentSelect"
+                        v-model:selectedKeys="selectedKeys"
+                      >
+                        <template #suffixIcon></template>
+                      </a-tree>
+                    </div>
+                    <div class="tableBox tabb" style="margin-top: 16px">
                       <a-table
                         style="border: 1px solid #f2f6fe"
-                        :columns="tablecolumns2"
-                        :data-source="tabledata2"
+                        :columns="tablecolumns"
+                        :data-source="tabledata"
                         :loading="tableDataTotal === -1 ? true : false"
                         expandRowByClick="true"
-                        :scroll="{ x: 500 }"
                         @expand="expandTable"
                         :pagination="false"
                         :row-selection="{
-                          columnWidth: 30,
-                          selectedRowKeys: selectedRowKeys2,
-                          onChange: onSelectChange2,
+                          columnWidth: 20,
+                          selectedRowKeys: selectedRowKeys,
+                          onChange: onSelectChange,
                         }"
                       />
                       <div class="pa">
@@ -284,55 +108,427 @@
                           showSizeChanger="true"
                           showQuickJumper="true"
                           hideOnSinglePage="true"
-                          :pageSize="pageSize2"
-                          :current="currentPage2"
-                          :total="tableDataTotal2"
+                          :pageSize="pageSize"
+                          v-model:current="currentPage"
+                          :total="tableDataTotal"
+                          :pagination="false"
                           class="pagination"
+                          v-if="tableDataTotal > 10"
+                          @change="changePagination"
                         />
                       </div>
                     </div>
                   </div>
-                </a-tab-pane>
-              </a-tabs>
-            </div>
-          </div>
-          <div class="right">
-            <div class="onerow">
-              <div class="onleft">
-                <div class="already">已选</div>
-                <div class="count">6</div>
-                <div class="peo">人</div>
-              </div>
-              <div class="clbox">
-                <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>
-            </div>
-            <div class="line"></div>
-            <div class="tit">添加组织</div>
-            <div class="line"></div>
-            <div class="tit">受众关联</div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="2" tab="添加组织" force-render>
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <div class="tab2">
+                    <div class="nameinp">
+                      <div class="namee">组织：</div>
+                      <a-input
+                        v-model:value="com"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                      />
+                    </div>
+                    <div class="btns">
+                      <div class="btn1" @click="searchOrg">
+                        <div class="img1">
+                          <img
+                            src="../../assets/images/courseManage/search0.png"
+                          />
+                        </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="t1">
+                      <div class="organize">姓名：</div>
+                      <a-input
+                        v-model:value="nameadd"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                      />
+                    </div> -->
+                  </div>
+                  <div class="boeTree">
+                    <div class="boeTreeTitle">BOE组织树</div>
+
+                    <a-tree
+                      class="treeMain treeMain2"
+                      :style="{ height: screenHeight - 430 + 'px' }"
+                      dropdownClassName="changetreedropdownboe"
+                      defaultExpandAll
+                      :dropdown-style="{
+                        maxHeight: '600px',
+                      }"
+                      placeholder="BOE组织树"
+                      allow-clear
+                      tree-default-expand-all
+                      :tree-data="treeData"
+                      @select="departmentSelect1"
+                      multiple
+                      v-model:selectedKeys="selectedKeys1"
+                    >
+                      <template #suffixIcon></template>
+                    </a-tree>
+                    <div
+                      class="boeTreeTitle"
+                      style="margin-top: 8px; cursor: pointer"
+                      @click="addOrgModal"
+                    >
+                      确认添加
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="受众关联">
+                <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+                  style="overflow-y: auto"
+                >
+                  <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: 260px; 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>
+                      <div class="btn2">
+                        <div class="img2">
+                          <img
+                            src="../../assets/images/courseManage/reset1.png"
+                          />
+                        </div>
+                        <div class="wz">重置</div>
+                      </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="tableBox tabb" style="margin-top: 16px">
+                    <a-table
+                      style="border: 1px solid #f2f6fe"
+                      :columns="tablecolumns2"
+                      :data-source="tabledata2"
+                      :loading="tableDataTotal === -1 ? true : false"
+                      expandRowByClick="true"
+                      :scroll="{ x: 500 }"
+                      @expand="expandTable"
+                      :pagination="false"
+                      :row-selection="{
+                        columnWidth: 30,
+                        selectedRowKeys: selectedRowKeys2,
+                        onChange: onSelectChange2,
+                      }"
+                    />
+                    <div class="pa" style="margin-top: 20px">
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                        v-if="tabledata2 > 10"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </a-tab-pane>
+            </a-tabs>
           </div>
         </div>
-        <div class="btnn">
-          <button class="btn1">取消</button>
-          <button class="btn2">确定</button>
+        <div class="right">
+          <div class="onerow">
+            <div class="onleft">
+              <div class="already">已选</div>
+              <!-- <div class="count">6</div>
+              <div class="peo">人</div> -->
+            </div>
+            <div class="clbox" @click="deleteAll">
+              <div class="colose"></div>
+              <span class="allclear">全部清除</span>
+            </div>
+          </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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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="
+                display: flex;
+                justify-content: flex-end;
+                margin-right: 20px;
+                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">
+        <button class="btn1">取消</button>
+        <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>
+</template>
   
   <script>
-  import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import elementResizeDetectorMaker from "element-resize-detector";
+import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
   export default {
     name: "StuAdd",
     props: {
@@ -344,861 +540,958 @@
     setup(props, ctx) {
       const state = reactive({
         screenHeight: document.body.clientHeight, // 屏幕高度
-        pageSize: 10,
-        currentPage: 1,
-        tableDataTotal: 50,
-        pageSize1: 10,
-        currentPage1: 1,
-        tableDataTotal1: 50,
-        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: "京东方",
-            value: "京东方",
-            children: [
-              {
-                title: "产研部",
-                value: "产研部",
-                children: [
-                  {
-                    title: "产品部",
-                    value: "产品部",
-                  },
-                  {
-                    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: "行政部",
-                    value: "行政部",
-                  },
-                ],
-              },
-            ],
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 50,
+      pageSize1: 10,
+      currentPage1: 1,
+      tableDataTotal1: 50,
+      pageSize2: 10,
+      currentPage2: 1,
+      tableDataTotal2: 50,
+
+      selectedRowKeys1: [],
+
+      activeKey: "1",
+      value: [], //级联选择框
+      choosevalue: null, //受众选择
+      valueSelect: null, //树形选择
+
+      valueSelectboe2: null, //boe树形选择
+      name: "",
+      nameadd: "",
+      nameaddd: "",
+      com: "",
+      //组织树
+      treeData: [
+        {
+          title: "京东方",
+          value: "京东方",
+          children: [
+            {
+              title: "产研部",
+              value: "产研部",
+              children: [
+                {
+                  title: "产品部",
+                  value: "产品部",
+                },
+                {
+                  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",
+                },
+              ],
+            },
+            {
+              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: "行政部",
+                  value: "行政部",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      //快速选人的table
+      tabledata: [
+        {
+          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: "产品部",
+        },
+        {
+          key: 10,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 11,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+        {
+          key: 12,
+          name: "小小李",
+          bum: "产研部",
+          numb: "000000",
+          guishu: "产品部",
+        },
+      ],
+      tablecolumns: [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          key: "name",
+          // width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "工号",
+          dataIndex: "numb",
+          key: "numb",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "guishu",
+          key: "guishu",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "部门",
+          dataIndex: "bum",
+          key: "bum",
+          // width: 30,
+          align: "center",
+          className: "h",
+        },
+      ],
+
+      //受众关联table数据
+      tabledata2: [
+        {
+          key: 1,
+          name: "学习受众",
+          time: "1668410969",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 2,
+          name: "案例受众",
+          time: "1668324569",
+          number: "10",
+          type: "普通受众",
+        },
+        {
+          key: 3,
+          name: "学习受众",
+          time: "1668238169",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 4,
+          name: "显示受众",
+          time: "1668133769",
+          number: "30",
+          type: "普通受众2",
+        },
+        {
+          key: 5,
+          name: "惯例受众",
+          time: "1668047369",
+          number: "50",
+          type: "普通受众",
+        },
+        {
+          key: 6,
+          name: "管理受众",
+          time: "1667960969",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 7,
+          name: "学习小组受众",
+          time: "1667874569",
+          number: "20",
+          type: "普通受众",
+        },
+        {
+          key: 8,
+          name: "学习受众",
+          time: "1667701769",
+          number: "10",
+          type: "普通受众",
+        },
+        {
+          key: 9,
+          name: "案例受众",
+          time: "1667442569",
+          number: "5",
+          type: "普通受众",
+        },
+        {
+          key: 10,
+          name: "项目受众",
+          time: "1667262569",
+          number: "25",
+          type: "普通受众",
+        },
+      ],
+      tablecolumns2: [
+        {
+          title: "受众名称",
+          dataIndex: "name",
+          key: "name",
+          width: 30,
+          align: "left",
+          className: "h",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          width: 35,
+          align: "center",
+          className: "h",
+          sorter: {
+            compare: (a, b) => a.time - b.time,
+            multiple: 3,
           },
-        ],
-        treeData2: [
-          {
-            title: "京东方",
-            value: "京东方",
-            children: [
-              {
-                title: "产研部",
-                value: "产研部",
-                children: [
-                  {
-                    title: "产品部",
-                    value: "产品部",
-                  },
-                  {
-                    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: "行政部",
-                    value: "行政部",
-                  },
-                ],
-              },
-            ],
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
+              </div>
+            );
           },
-        ],
-        tabledata: [
-          {
-            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: "产品部",
-          },
-        ],
-        tablecolumns: [
-          {
-            title: "姓名",
-            dataIndex: "name",
-            key: "name",
-            // width: 30,
-            align: "left",
-            className: "h",
-          },
-          {
-            title: "工号",
-            dataIndex: "numb",
-            key: "numb",
-            // width: 30,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "归属组织",
-            dataIndex: "guishu",
-            key: "guishu",
-            // width: 30,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "部门",
-            dataIndex: "bum",
-            key: "bum",
-            // 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",
-          },
-        ],
-        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: "李明",
-          },
-        ],
+        },
+        {
+          title: "人数",
+          dataIndex: "number",
+          key: "number",
+          width: 30,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
+          width: 40,
+          align: "center",
+          className: "h",
+        },
+      ],
+      organizeList1: [
+        {
+          value: "产品受众群体",
+          label: "产品受众群体",
+        },
+        {
+          value: "人力资源hrbp",
+          label: "人力资源hrbp",
+        },
+      ],
+      //快速选人-------------------------------------
+      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";
         ctx.emit("update:Stuvisible", false);
       };
   
-      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 = () => {
-        state.screenHeight = document.body.clientHeight;
-      };
-  
-      onMounted(() => {
-        // console.log("11111", 1);
-        window.addEventListener("resize", getMousePosition, false);
-        // judgeUrl();
-      });
-      onUnmounted(() => {
-        window.removeEventListener("resize", getMousePosition, false);
-      });
+       const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    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 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("pathstuadd").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow = () => {
+      state.showMore = false;
+      state.showHidden = true;
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox").style.height = "";
+    };
+    const morePeopleHidden = () => {
+      state.showMore = true;
+      state.showHidden = false;
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#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("pathstuadd").querySelector("#selecteds1"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden1) {
+            state.showMore1 = true;
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore1 = false;
+            state.showHidden1 = false;
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox1").style.overflow = "hidden";
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox1").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow1 = () => {
+      state.showMore1 = false;
+      state.showHidden1 = true;
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox1").style.overflow = "";
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox1").style.height = "";
+    };
+    const morePeopleHidden1 = () => {
+      state.showMore1 = true;
+      state.showHidden1 = false;
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox1").style.overflow = "hidden";
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox1").style.height = "160px";
+    };
+    //搜索组织
+    const searchOrg = () => {
+      let treeTitle = document
+        .getElementById("pathstuadd")
+        .querySelector(".treeMain2")
+        .querySelectorAll(".ant-tree-title");
+      if (state.com) {
+        for (let i = 0; i < treeTitle.length; i++) {
+          if (state.com === treeTitle[i].innerHTML) {
+            document
+              .getElementById("pathstuadd")
+              .querySelector(".treeMain2")
+              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
+            return;
+          } else if (i == treeTitle.length - 1) {
+            message.destroy();
+            message.warning("未找到该部门");
+          }
+        }
+      } else {
+        message.destroy();
+        message.warning("请输入组织名称");
+      }
+    };
+    // 结束 添加组织------------------------------------------------------------------
+
+    // 开始 受众关联------------------------------------------------------------------
+
+    //受众关联 选中的数组
+    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("pathstuadd").querySelector("#selecteds2"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden2) {
+            state.showMore2 = true;
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore2 = false;
+            state.showHidden2 = false;
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox2").style.overflow = "hidden";
+            document
+              .getElementById("pathstuadd")
+              .querySelector("#selectedsBox2").style.height = "160px";
+          }
+        }
+      );
+    };
+    const morePeopleShow2 = () => {
+      state.showMore2 = false;
+      state.showHidden2 = true;
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox2").style.overflow = "";
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox2").style.height = "";
+    };
+    const morePeopleHidden2 = () => {
+      state.showMore2 = true;
+      state.showHidden2 = false;
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#selectedsBox2").style.overflow = "hidden";
+      document
+        .getElementById("pathstuadd")
+        .querySelector("#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,
+         ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      onSelectChange,
+      onSelectChange2,
+      // change,
+      departmentSelect,
+      deleteChoosePeople,
+      selectedsHeight,
+      morePeopleShow,
+      morePeopleHidden,
+
+      departmentSelect1,
+      addOrgModal,
+      addOrg,
+      closeOrgModal,
+      selectedsHeight1,
+      morePeopleShow1,
+      morePeopleHidden1,
+      deleteChoosePeople1,
+
+      selectedsHeight2,
+      morePeopleShow2,
+      morePeopleHidden2,
+      deleteChoosePeople2,
+
+      deleteAll,
+
+      searchOrg,
       };
     },
   };
   </script>
   
   <style lang="scss">
-  .stuadd {
-    .drawerMain {
-      min-width: 600px;
-      margin: 0px 32px 0px 32px;
-      // overflow-y: auto;
+  .pathstuadd {
+    .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;
       display: flex;
-      flex-direction: column;
-  
-      .header {
-        height: 73px;
-        border-bottom: 1px solid #e8e8e8;
-        display: flex;
-        flex-shrink: 0;
-        justify-content: space-between;
-        align-items: center;
-        // background-color: red;
-        margin-bottom: 20px;
-        .headerTitle {
-          font-size: 18px;
-          font-weight: 600;
-          color: #333333;
-          line-height: 25px;
-          // margin-left: 24px;
-        }
+      flex-shrink: 0;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
       }
-      .main {
-        display: flex;
-        //height: 80%;
-        margin-bottom: 72px;
-        overflow-y: auto;
-        .left {
-          // overflow-y: auto;
-          width: 65%;
-          // height: 100%;
-          border-right: 1px solid rgba(233, 233, 233, 1);
-          .tabs {
-            margin-right: 33px;
-  
-            .tab1 {
+    }
+    .main {
+      display: flex;
+      //  min-width: 1200px;
+      //height: 80%;
+      margin-bottom: 72px;
+      overflow-y: auto;
+      //  overflow-x: auto;
+      .left {
+        // overflow-y: auto;
+        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;
+            align-items: center;
+            .t1 {
               display: flex;
-              flex-wrap: wrap;
-              justify-content: space-between;
               align-items: center;
-              .t1 {
-                display: flex;
-                align-items: center;
-                margin-bottom: 5px;
-              }
-              .nameinp {
-                display: flex;
-                align-items: center;
-                margin-top: 10px;
-                .namee {
-                  color: rgba(0, 0, 0, 0.85);
-                  font-size: 14px;
-                }
-              }
-              .btns {
-                display: flex;
-                margin-top: 10px;
-                .btn1 {
-                  width: 100px;
-                  height: 40px;
-                  margin-right: 16px;
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  color: #ffffff;
-                  font-size: 14px;
-                  background: #409eff;
-                  border-radius: 8px;
-                  border: 1px solid #409eff;
-                  cursor: pointer;
-                  .wz {
-                    margin-left: 10px;
-                  }
-                }
-                .btn2 {
-                  width: 100px;
-                  height: 40px;
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  color: #409eff;
-                  font-size: 14px;
-                  background: #ffffff;
-                  border-radius: 8px;
-                  cursor: pointer;
-                  border: 1px solid #409eff;
-                  .wz {
-                    margin-left: 10px;
-                  }
-                }
+              margin-bottom: 5px;
+            }
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
               }
             }
             .btns {
               display: flex;
               margin-top: 10px;
+              margin-left: 34px;
               .btn1 {
                 width: 100px;
                 height: 40px;
@@ -1233,390 +1526,631 @@
                 }
               }
             }
-            .line {
-              width: 100%;
-              height: 40px;
-              background-color: #e9f6fe;
-              display: flex;
-              justify-content: center;
-              align-items: center;
-              margin-top: 20px;
-              border: 1px solid #c3e6fc;
-  
-              .inline {
-                width: 95%;
-                height: 100%;
-                display: flex;
-                justify-content: space-between;
-  
-                // background-color: #bfa;
-                .left1 {
-                  height: 100%;
-                  display: flex;
-                  align-items: center;
-  
-                  .img {
-                    width: 14px;
-                    height: 15px;
-                    background-image: url(../../assets/images/leveladd/gan.png);
-                    background-size: 100% 100%;
-                  }
-  
-                  .text {
-                    color: #999ba3;
-                  }
-  
-                  .text2 {
-                    color: #4ea6ff;
-                    margin-left: 5px;
-                    margin-right: 5px;
-                  }
-  
-                  .text3 {
-                    color: #999ba3;
-                    margin-left: 20px;
-                  }
-                }
-  
-                .right1 {
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #387df7;
-                  height: 100%;
-                  display: flex;
-                  align-items: center;
-                  cursor: pointer;
-                }
-              }
-            }
-            .chooseLeft {
-              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;
-                    }
-                  }
-                }
-              }
-              .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;
-                  }
-                }
-              }
-            }
-  
-            .tab2 {
-              display: flex;
-              align-items: center;
-              // margin-top: 10px;
-              flex-wrap: wrap;
-              justify-content: space-between;
-              .nameinp {
-                display: flex;
-                align-items: center;
-                margin-top: 10px;
-                .namee {
-                  color: rgba(0, 0, 0, 0.85);
-                  font-size: 14px;
-                }
-              }
-  
-              .t1 {
-                display: flex;
-                align-items: center;
-                margin-bottom: 5px;
-              }
-              .btns {
-                display: flex;
-                // margin-top: -10px;
-                .btn1 {
-                  width: 100px;
-                  height: 40px;
-                  margin-right: 16px;
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  color: #ffffff;
-                  font-size: 14px;
-                  background: #409eff;
-                  border-radius: 8px;
-                  border: 1px solid #409eff;
-                  cursor: pointer;
-                  .wz {
-                    margin-left: 10px;
-                  }
-                }
-                .btn2 {
-                  width: 100px;
-                  height: 40px;
-                  display: flex;
-                  align-items: center;
-                  justify-content: center;
-                  color: #409eff;
-                  font-size: 14px;
-                  background: #ffffff;
-                  border-radius: 8px;
-                  cursor: pointer;
-                  border: 1px solid #409eff;
-                  .wz {
-                    margin-left: 10px;
-                  }
-                }
-              }
-              .organize {
-                color: rgba(0, 0, 0, 0.85);
-                font-size: 14px;
-                white-space: nowrap;
-              }
-  
-              .ant-select-dropdown {
-                min-width: 800px !important;
-              }
-              .ant-select {
-                border-radius: 8px !important;
-                // background-color: red;
-              }
-              .ant-cascader {
-                width: 264px;
-                height: 40px;
-                border-radius: 8px !important;
-                .ant-select-selector {
-                  height: 100%;
-                }
-                .ant-select-selection-search-input {
-                  height: 40px;
-                }
-              }
-            }
-            .boeTree {
-              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;
-                  }
-                }
-              }
-            }
           }
-        }
-        .right {
-          width: 35%;
-          .onerow {
+          .btns {
             display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-right: 40px;
-            flex-wrap: wrap;
-            .onleft {
+            margin-top: 10px;
+            .btn1 {
+              width: 100px;
+              height: 40px;
+              margin-right: 16px;
               display: flex;
-              text-align: center;
-              .already {
-                color: rgba(51, 51, 51, 1);
-                font-size: 16px;
-                font-weight: 500;
-                margin-left: 32px;
-                white-space: nowrap;
-                // margin-bottom: 20px;
-              }
-              .count {
-                color: #388be1;
-                font-size: 16px;
-                margin: 0 6px;
-              }
-              .peo {
-                color: rgba(51, 51, 51, 1);
-                font-size: 16px;
-                font-weight: 500;
+              align-items: center;
+              justify-content: center;
+              color: #ffffff;
+              font-size: 14px;
+              background: #409eff;
+              border-radius: 8px;
+              border: 1px solid #409eff;
+              cursor: pointer;
+              .wz {
+                margin-left: 10px;
               }
             }
-            .clbox {
-              margin-left: 30px;
+            .btn2 {
+              width: 100px;
+              height: 40px;
               display: flex;
-              justify-content: center;
               align-items: center;
+              justify-content: center;
+              color: #409eff;
+              font-size: 14px;
+              background: #ffffff;
+              border-radius: 8px;
               cursor: pointer;
-              width: 104px;
-              height: 32px;
-              border-radius: 4px;
-              background: #409eff;
-              .colose {
-                width: 16px;
-                height: 16px;
-                // border-radius: 8px;
-                // background: #ffffff;
-                // position: relative;
-                background-image: url(../../assets/images/basicinfo/ch.png);
-                background-size: 100%;
-                margin-right: 4px;
-              }
-              .allclear {
-                color: rgba(255, 255, 255, 1);
-                font-size: 14px;
+              border: 1px solid #409eff;
+              .wz {
+                margin-left: 10px;
               }
             }
           }
           .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;
-          }
-          .selecteds {
+            width: 100%;
+            height: 40px;
+            background-color: #e9f6fe;
             display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-top: 20px;
+            border: 1px solid #c3e6fc;
+
+            .inline {
+              width: 95%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+
+              // background-color: #bfa;
+              .left1 {
+                height: 100%;
+                display: flex;
+                align-items: center;
+
+                .img {
+                  width: 14px;
+                  height: 15px;
+                  background-image: url(../../assets/images/leveladd/gan.png);
+                  background-size: 100% 100%;
+                }
+
+                .text {
+                  color: #999ba3;
+                }
+
+                .text2 {
+                  color: #4ea6ff;
+                  margin-left: 5px;
+                  margin-right: 5px;
+                }
+
+                .text3 {
+                  color: #999ba3;
+                  margin-left: 20px;
+                }
+              }
+
+              .right1 {
+                font-size: 14px;
+                font-weight: 400;
+                color: #387df7;
+                height: 100%;
+                display: flex;
+                align-items: center;
+                cursor: pointer;
+              }
+            }
+          }
+          .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;
+                }
+              }
+            }
+          }
+
+          .tab2 {
+            display: flex;
+            align-items: center;
+            // margin-top: 10px;
             flex-wrap: wrap;
-            margin-left: 32px;
-            height: 200px;
-            overflow-y: hidden;
-            .chose {
-              width: 64px;
-              height: 24px;
-              margin-top: 25px;
-              margin-right: 25px;
+            justify-content: space-between;
+            .nameinp {
+              display: flex;
+              align-items: center;
+              margin-top: 10px;
+              .namee {
+                color: rgba(0, 0, 0, 0.85);
+                font-size: 14px;
+              }
+            }
+
+            .t1 {
+              display: flex;
+              align-items: center;
+              margin-bottom: 5px;
+            }
+            .btns {
+              display: flex;
+              // margin-top: -10px;
+              .btn1 {
+                width: 100px;
+                height: 40px;
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #ffffff;
+                font-size: 14px;
+                background: #409eff;
+                border-radius: 8px;
+                border: 1px solid #409eff;
+                cursor: pointer;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+              .btn2 {
+                width: 100px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                color: #409eff;
+                font-size: 14px;
+                background: #ffffff;
+                border-radius: 8px;
+                cursor: pointer;
+                border: 1px solid #409eff;
+                .wz {
+                  margin-left: 10px;
+                }
+              }
+            }
+            .organize {
+              color: rgba(0, 0, 0, 0.85);
+              font-size: 14px;
+              white-space: nowrap;
+            }
+
+            .ant-select-dropdown {
+              min-width: 800px !important;
+            }
+            .ant-select {
+              border-radius: 8px !important;
+              // background-color: red;
+            }
+            .ant-cascader {
+              width: 264px;
+              height: 40px;
+              border-radius: 8px !important;
+              .ant-select-selector {
+                height: 100%;
+              }
+              .ant-select-selection-search-input {
+                height: 40px;
+              }
+            }
+          }
+          .boeTree {
+            .boeTreeTitle {
+              width: 280px;
+              height: 40px;
+              border-radius: 4px;
+              border: 1px solid #c3c3c3;
               display: flex;
               align-items: center;
               justify-content: center;
-              border-radius: 2px;
-              border: 1px solid rgba(56, 139, 225, 1);
-              color: rgba(56, 139, 225, 1);
-              font-size: 12px;
-              position: relative;
-              .ch {
+              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: 320px;
+        flex-shrink: 0;
+        overflow-y: auto;
+        .onerow {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-right: 40px;
+          flex-wrap: wrap;
+          .onleft {
+            display: flex;
+            text-align: center;
+            .already {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+              margin-left: 32px;
+              white-space: nowrap;
+              // margin-bottom: 20px;
+            }
+            .count {
+              color: #388be1;
+              font-size: 16px;
+              margin: 0 6px;
+            }
+            .peo {
+              color: rgba(51, 51, 51, 1);
+              font-size: 16px;
+              font-weight: 500;
+            }
+          }
+          .clbox {
+            margin-left: 30px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            cursor: pointer;
+            width: 104px;
+            height: 32px;
+            border-radius: 4px;
+            background: #409eff;
+            .colose {
+              width: 16px;
+              height: 16px;
+              // border-radius: 8px;
+              // background: #ffffff;
+              // position: relative;
+              background-image: url(../../assets/images/basicinfo/ch.png);
+              background-size: 100%;
+              margin-right: 4px;
+            }
+            .allclear {
+              color: rgba(255, 255, 255, 1);
+              font-size: 14px;
+            }
+          }
+        }
+        .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;
+            padding-left: 10px;
+            padding-right: 10px;
+            height: 24px;
+            margin-top: 25px;
+            margin-right: 25px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 2px;
+            border: 1px solid rgba(56, 139, 225, 1);
+            color: rgba(56, 139, 225, 1);
+            font-size: 12px;
+            position: relative;
+            .ch {
+              position: absolute;
+              width: 18px;
+              height: 18px;
+              background-image: url(../../assets/images/basicinfo/ch.png);
+              right: -8px;
+              top: -8px;
+            }
+          }
+        }
+      }
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      background-color: #fff;
+      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: #409eff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+  }
+  .changetreedropdown {
+  width: 500px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
+
+.changetreedropdownboe {
+  width: 240px !important;
+  border-radius: 5px;
+  min-height: 600px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
+.confirmAddOrg {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+        .delete {
+          z-index: 999;
+          width: 424px;
+          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;
-                width: 18px;
-                height: 18px;
-                background-image: url(../../assets/images/basicinfo/ch.png);
-                right: -8px;
-                top: -8px;
+                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;
               }
             }
           }
         }
       }
-      .btnn {
-        height: 72px;
-        width: 100%;
-        position: absolute;
-        background-color: #fff;
-        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: #409eff;
-          border-radius: 8px;
-          border: 0;
-          margin-left: 15px;
-          color: #fff;
-        }
-      }
-    }
-  }
-  .changetreedropdown {
-    width: 500px !important;
-    .ant-select-tree-list-scrollbar {
-      width: 5px !important;
-      .ant-select-tree-list-scrollbar-thumb {
-        background-color: #4ea6ff !important;
-      }
-    }
-    .ant-select-tree-indent-unit {
-      width: 7px !important;
-    }
-  }
-  .changetreedropdownboe {
-    width: 240px !important;
-    border-radius: 5px;
-    min-height: 600px !important;
-    .ant-select-tree-list-scrollbar {
-      width: 5px !important;
-      .ant-select-tree-list-scrollbar-thumb {
-        background-color: #4ea6ff !important;
-      }
-    }
-    .ant-select-tree-indent-unit {
-      width: 7px !important;
+    }
+    .ant-modal-close-x {
+      display: none;
     }
   }
+}
   </style>
   
\ No newline at end of file
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 2e46199b..4887d1a8 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1673,6 +1673,13 @@
     <!-- 添加授权侧弹窗 -->
     <corpowerlist v-model:corpowerlistVisible="corpowerlistvisible" />
     <!-- 添加授权侧弹窗 -->
+     <!-- 添加查看权侧弹窗 -->
+    <course-view v-model:courseviewvisible="courseviewvisible" />
+    <!-- 添加查看权侧弹窗 -->
+     <!-- 添加归属权侧弹窗 -->
+    <course-owner v-model:courseownervisible="courseownervisible" />
+    <!-- 添加归属权侧弹窗 -->
+    
   </div>
 </template>
 <script>
@@ -1688,6 +1695,8 @@ import {
 import { message } from "ant-design-vue";
 import OwnPower from "../../components/drawers/OwnPower.vue";
 import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
+import CourseView from "../../components/drawers/CourseView.vue"
+import CourseOwner from "../../components/drawers/CourseOwner.vue"
 import {
   // list,
   edit,
@@ -2130,6 +2139,8 @@ export default defineComponent({
     Corpowerlist,
     Editor,
     Toolbar,
+    CourseView,
+    CourseOwner,
   },
   setup() {
     const state = reactive({
@@ -2426,7 +2437,8 @@ export default defineComponent({
       //抽屉状态
       ownpowervisible: false,
       corpowerlistvisible: false,
-
+      courseviewvisible:false,
+courseownervisible:false,
       offcourseId: null,
       projectName: "",
       name: "",
@@ -2747,14 +2759,18 @@ export default defineComponent({
                             value="查看权"
                             label="查看权"
                             style="padding-left:30px;"
-                          >
+                          onClick={()=>{
+                            state.courseviewvisible=true
+                          }}>
                             <div>查看权</div>
                           </a-select-option>
                           <a-select-option
                             value="管理权"
                             label="管理权"
                             style="padding-left:30px;"
-                          >
+                          onClick={()=>{
+                            state.courseownervisible=true
+                          }}>
                             <div>管理权</div>
                           </a-select-option>
                         </a-select>
@@ -2852,14 +2868,18 @@ export default defineComponent({
                             value="查看权"
                             label="查看权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseviewvisible=true
+                          }}>
                             <div>查看权</div>
                           </a-select-option>
                           <a-select-option
                             value="管理权"
                             label="管理权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseownervisible=true
+                          }}>
                             <div>管理权</div>
                           </a-select-option>
                         </a-select>
@@ -2988,14 +3008,18 @@ export default defineComponent({
                             value="查看权"
                             label="查看权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseviewvisible=true
+                          }}>
                             <div>查看权</div>
                           </a-select-option>
                           <a-select-option
                             value="管理权"
                             label="管理权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseownervisible=true
+                          }}>
                             <div>管理权</div>
                           </a-select-option>
                         </a-select>
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 571946c0..040370df 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -1,6 +1,6 @@
 <!---- 创建单层子项目页面 --->
 <template>
-	<div class="projectAdd">
+	<div class="sonproject">
 		<div class="header">
 			<span class="title">创建/编辑单层子项目</span>
 			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
@@ -765,7 +765,7 @@ export default {
 };
 </script>
 <style lang="scss">
-.projectAdd {
+.sonproject {
 	width: 100%;
 	// height: inherit;
 	// flex: 1;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 293616e0..d0768b1d 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="allCon">
+  <div class="taskadd">
     <div class="left clearfix">
       <div class="leftmain">
         <div class="tit">
@@ -794,7 +794,7 @@
       v-model:visible="visiblene"
       :footer="null"
       centered="true"
-      wrapClassName="changeModal"
+      wrapClassName="moveModal"
     >
       <div class="con">
         <div class="header">
@@ -1837,8 +1837,78 @@ export default {
       }
     }
   }
+
+.name {
+  width: 78%;
+  // 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;
+    }
+  }
+  .d {
+    margin-top: 8px;
+    font-size: 25px;
+    color: #ff4e4e;
+  }
+  .box {
+    position: relative;
+    margin-left: 14px;
+    .box1 {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      width: 50px;
+      margin-left: -25px;
+      margin-top: -5px;
+      border-top: 2px solid rgba(78, 166, 255, 1);
+    }
+    .box2 {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      height: 50px;
+      //margin-left: -5px;
+      margin-top: -25px;
+      border-left: 2px solid rgba(78, 166, 255, 1);
+    }
+  }
+  .inname {
+    color: #000000;
+    font-size: 14px;
+    margin-left: 7px;
+  }
+  .in {
+    margin-left: 14px;
+    flex: 1;
+    // .ant-radio-wrapper {
+    // }
+    .ant-input-affix-wrapper {
+      width: 384px;
+      border-radius: 8px;
+    }
+    .ant-input {
+      border-radius: 8px;
+      // height: 120%;
+      //width: 384px;
+      height: 30px;
+    }
+  }
 }
-.changeModal {
+
+}
+.moveModal {
   .ant-modal {
     width: 549px !important;
     height: 245px !important;
@@ -1939,179 +2009,112 @@ export default {
     }
   }
 }
-.info {
-  width: 78%;
-  // background-color: lightcoral;
-  display: flex;
-  margin-top: 30px;
-  // align-items: center;
-  // height: 40px;
-  // border: 1px solid black;
+// .info {
+//   width: 78%;
+//   // background-color: lightcoral;
+//   display: flex;
+//   margin-top: 30px;
+//   // align-items: center;
+//   // height: 40px;
+//   // border: 1px solid black;
 
-  .inname {
-    color: #6f6f6f;
-    font-size: 14px;
-    margin-left: 26px;
-    margin-top: 15px;
-  }
-  .in {
-    margin-left: 14px;
-    width: 81%;
-    position: relative;
-    .ant-input {
-      border-radius: 5px;
-      // height: 120%;
-      width: 100%;
-      height: 130px;
-      resize: none;
-    }
-  }
-}
-.name {
-  width: 78%;
-  // 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;
-    }
-  }
-  .d {
-    margin-top: 8px;
-    font-size: 25px;
-    color: #ff4e4e;
-  }
-  .box {
-    position: relative;
-    margin-left: 14px;
-    .box1 {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 50px;
-      margin-left: -25px;
-      margin-top: -5px;
-      border-top: 2px solid rgba(78, 166, 255, 1);
-    }
-    .box2 {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      height: 50px;
-      //margin-left: -5px;
-      margin-top: -25px;
-      border-left: 2px solid rgba(78, 166, 255, 1);
-    }
-  }
-  .inname {
-    color: #000000;
-    font-size: 14px;
-    margin-left: 7px;
-  }
-  .in {
-    margin-left: 14px;
-    flex: 1;
-    // .ant-radio-wrapper {
-    // }
-    .ant-input-affix-wrapper {
-      width: 384px;
-      border-radius: 8px;
-    }
-    .ant-input {
-      border-radius: 8px;
-      // height: 120%;
-      //width: 384px;
-      height: 30px;
-    }
-  }
-}
-.drawerStyle {
-  .ant-drawer-content-wrapper {
-    // max-width: 1000px;
-    .ant-drawer-header {
-      display: none !important;
-    }
-    .ant-drawer-body {
-      padding: 0;
-    }
-  }
-  .drawerMain {
-    min-width: 600px;
-    margin: 0px 32px 0px 32px;
-    overflow-x: auto;
-    display: flex;
-    flex-direction: column;
-    .header {
-      height: 73px;
-      border-bottom: 1px solid #e8e8e8;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      // background-color: red;
-      margin-bottom: 20px;
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        // margin-left: 24px;
-      }
-    }
-    .drawerbox {
-      margin: 20px 38px 30px;
-      th {
-        background-color: #eff4fc !important;
-      }
+//   .inname {
+//     color: #6f6f6f;
+//     font-size: 14px;
+//     margin-left: 26px;
+//     margin-top: 15px;
+//   }
+//   .in {
+//     margin-left: 14px;
+//     width: 81%;
+//     position: relative;
+//     .ant-input {
+//       border-radius: 5px;
+//       // height: 120%;
+//       width: 100%;
+//       height: 130px;
+//       resize: none;
+//     }
+//   }
+// }
 
-      .ant-table-tbody
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-        > td {
-        background: #f6f9fd;
-      }
-    }
-    .btnn {
-      height: 72px;
-      width: 100%;
-      position: absolute;
-      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;
-      }
-    }
-  }
-}
-.allCon {
+// .drawerStyle {
+//   .ant-drawer-content-wrapper {
+//     // max-width: 1000px;
+//     .ant-drawer-header {
+//       display: none !important;
+//     }
+//     .ant-drawer-body {
+//       padding: 0;
+//     }
+//   }
+//   .drawerMain {
+//     min-width: 600px;
+//     margin: 0px 32px 0px 32px;
+//     overflow-x: auto;
+//     display: flex;
+//     flex-direction: column;
+//     .header {
+//       height: 73px;
+//       border-bottom: 1px solid #e8e8e8;
+//       display: flex;
+//       justify-content: space-between;
+//       align-items: center;
+//       // background-color: red;
+//       margin-bottom: 20px;
+//       .headerTitle {
+//         font-size: 18px;
+//         font-weight: 600;
+//         color: #333333;
+//         line-height: 25px;
+//         // margin-left: 24px;
+//       }
+//     }
+//     .drawerbox {
+//       margin: 20px 38px 30px;
+//       th {
+//         background-color: #eff4fc !important;
+//       }
+
+//       .ant-table-tbody
+//         > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+//         > td {
+//         background: #f6f9fd;
+//       }
+//     }
+//     .btnn {
+//       height: 72px;
+//       width: 100%;
+//       position: absolute;
+//       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;
+//       }
+//     }
+//   }
+// }
+.taskadd {
   width: 100%;
   display: flex;
   min-width: 933px;
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 1c024efb..215b48f6 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -89,6 +89,12 @@
     <div @click="downloadQr(400)">下载400</div>
     <div @click="downloadQr(800)">下载800</div>
   </div>
+
+<div @click="changeCodevisible">显示二维码弹窗</div>
+  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0"/>
+
+  <div @click="changeCodevisible2">显示二维码弹窗22</div>
+  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1"/>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -105,6 +111,8 @@ import { useRouter } from "vue-router";
 import draggable from "vuedraggable";
 import QrcodeVue from "qrcode.vue";
 import html2canvas from "html2canvas";
+
+import TwoDimensionalCode from '../../components/TwoDimensionalCode.vue'
 export default {
   name: "SystemManage",
   components: {
@@ -113,6 +121,7 @@ export default {
     // PlusOutlined,
     draggable,
     QrcodeVue,
+    TwoDimensionalCode
   },
   setup() {
     const state = reactive({
@@ -148,8 +157,14 @@ export default {
           name: "拖拽六",
         },
       ],
+      
       qrcodeUrl: "https://www.baidu.com/",
       qrcodeSize:800,
+
+      codevisible:false,
+      codeInfo:{},
+      codevisible2:false,
+      codeInfo2:{}
     });
 
     const showDrawer = () => {
@@ -303,6 +318,24 @@ let canvasBox = document.createElement('canvas');
       //   a.click();
       });
     };
+
+    //显示二维码弹窗
+    const changeCodevisible=()=>{
+      state.codevisible=true
+      state.codeInfo={
+        title:"签到二维码",
+        name:'管理者进阶面授课程',
+        url:"https://www.baidu.com/",
+      }
+    }
+    const changeCodevisible2=()=>{
+      state.codevisible2=true
+      state.codeInfo2={
+        title:"签到二维码2222",
+        name:'管理者进阶面授课程2222',
+        url:"https://blog.csdn.net/qq_44034384/article/details/93612152",
+      }
+    }
     return {
       ...toRefs(state),
       showDrawer,
@@ -311,6 +344,8 @@ let canvasBox = document.createElement('canvas');
       beforeUpload,
       golearningpath,
       downloadQr,
+      changeCodevisible,
+      changeCodevisible2,
     };
   },
 };

From 3fa240bb5bc26910ff629c829ef9fc6713c4db50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Tue, 15 Nov 2022 10:04:51 +0800
Subject: [PATCH 40/90] =?UTF-8?q?feat:=20=E5=85=B3=E5=8D=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E8=8E=B7=E5=8F=96=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E5=BA=A6=E5=9B=BE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                   |   3 +-
 src/components/drawers/CheckStu.vue | 147 ++++++++++++-----------
 src/views/learningpath/LevelAdd.vue | 173 +++++++++++-----------------
 3 files changed, 144 insertions(+), 179 deletions(-)

diff --git a/src/api/index1.js b/src/api/index1.js
index abe4699f..b8f120f7 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -72,7 +72,8 @@ export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
 export const addStudent = (obj) => http.post('/admin/router/addStudent', obj);
 //删除学员
 export const delStudent = (obj) => http.post('/admin/router/deleteStudent', obj);
-
+// 获取学员路径图进度明细
+export const stuProgress = (obj) => http.post('/admin/router/studentProcess', obj);
 
 
 //项目基础信息-----------------------------------
diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 0b32c086..25585065 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -21,14 +21,14 @@
             <img src="../../assets/images/studentimg/character.png" />
           </div>
           <div class="stumation">
-            <div class="stuname">王明</div>
-            <div class="stugangw">产研部门 - 产品经理</div>
+            <div class="stuname">{{pro.userInfoBo.userName}}</div>
+            <div class="stugangw">{{pro.userInfoBo.deptName+'-'+pro.userInfoBo.jobName}}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">2</span>
-              <span class="total">/10</span>
+              <span class="nub1">{{pro.currentChapterCnt}}</span>
+              <span class="total">/{{pro.totalChapterCnt}}</span>
             </div>
           </div>
           <a-divider
@@ -42,8 +42,8 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
-              <span class="nub1">3</span>
-              <span class="total">/10</span>
+              <span class="nub1">{{pro.currentReqCnt}}</span>
+              <span class="total">/{{pro.totalReqCnt}}</span>
             </div>
           </div>
           <a-divider
@@ -57,7 +57,7 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">1</span>
+              <span class="nub1">{{pro.certCnt}}</span>
             </div>
           </div>
         </div>
@@ -68,8 +68,10 @@
             <div><img src="../../assets/images/studentimg/chak.png" /></div>
           </div>
         </div>
-        <div class="mainbox">
-          <div class="rowtitle" @click="changeDown">
+        <div v-for="(item,index) in pro.chapterProcessList" class="mainbox"
+        style="margin-top: 15px; height: 56px"
+        :key="item.chapterId">
+        <div class="rowtitle" @click="changeDown">
             <div class="titleimg">
               <img
                 :src="
@@ -79,84 +81,26 @@
                 "
               />
             </div>
-            <div class="titletext">阶段1 腾飞班阶段1</div>
+            <div class="titletext">关卡{{index}} {{item.chapterName}}</div>
           </div>
+
           <div :style="{ display: showDown ? 'block' : 'none' }">
-            <div class="rowclass">
+            <div  v-for="_item in item.taskProcessList" :key="_item.routerTaskId" class="rowclass">
               <div class="leftclass">
                 <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">在线</div>
-                <div class="text2">如何成为一个产品经理</div>
+                <div class="text1">{{checkType(_item.type)}}</div>
+                <div class="text2">{{_item.name}}</div>
               </div>
               <div class="alreadyclass">
                 <div class="alimg">
                   <img src="../../assets/images/studentimg/complete.png" />
                 </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
-                <div class="text1">直播</div>
-                <div class="text2">管理者播课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
-                </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/mian.png" /></div>
-                <div class="text1">面授</div>
-                <div class="text2">管理面授课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/huo.png" /></div>
-                <div class="text1">活动</div>
-                <div class="text2">管理者活动</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
-                <div class="text1">作业</div>
-                <div class="text2">管理者作业</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
+                <div class="altext">{{checkStatus(_item.status)}}</div>
               </div>
             </div>
           </div>
         </div>
-        <div class="mainbox" style="margin-top: 15px; height: 56px">
-          <div class="rowtitle">
-            <div class="titleimg">
-              <img src="../../assets/images/studentimg/close.png" />
-            </div>
-            <div class="titletext">阶段2 腾飞班阶段2</div>
-          </div>
-        </div>
+
       </div>
       <div class="btnn">
         <button class="btn2">关闭</button>
@@ -169,6 +113,8 @@
 <script>
 import { reactive, toRefs } from "vue";
 import CheckStuMess from "./CheckStuMess.vue";
+import {stuProgress} from "@/api/index1";
+import {message} from "ant-design-vue";
 export default {
   name: "CheckStu",
   components: { CheckStuMess },
@@ -177,11 +123,16 @@ export default {
       type: Boolean,
       default: false,
     },
+    studentId: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
     const state = reactive({
       StuMessvisible: false,
       showDown: false,
+      pro:null,
     });
     const closeDrawer = () => {
       ctx.emit("update:CheckStuvisible", false);
@@ -191,11 +142,56 @@ export default {
       state.StuMessvisible = true;
     };
     const afterVisibleChange = (bool) => {
+      if(props.CheckStuvisible) {
+        getStuProgress()
+      }
       console.log("state", bool);
     };
     const changeDown = () => {
       state.showDown = !state.showDown;
     };
+    const getStuProgress = () => {
+      let obj = {
+        routerId:100,
+        studentId:props.studentId
+      }
+      stuProgress(obj).then(res => {
+        message.success("操作成功")
+        state.pro = res.data.data
+        console.log(res)
+      }).catch(err => {
+        message.error("操作失败"+err)
+        console.log(err)
+      })
+    }
+
+    const checkType = (type) => {
+    let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
+      ];
+      return typeRules[type];
+  }
+
+  const checkStatus = (status) => {
+    if(status < 0) return "未开始"
+    let statusRules = [
+      "进行中","已完成"
+    ]
+    return statusRules[status]
+  }
+
 
     return {
       ...toRefs(state),
@@ -203,7 +199,10 @@ export default {
       closeDrawer,
       showProMess,
       changeDown,
+      checkType,
+      checkStatus,
       // change,
+
     };
   },
 };
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index fd563c8a..d980a164 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -69,7 +69,7 @@
                 <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
                   添加任务
                 </div>
-                <div class="centermain">快速添加任务/阶段</div>
+                <div class="centermain">快速添加任务/关卡</div>
               </div>
               <div
                 class="taskbox"
@@ -113,7 +113,7 @@
           <!-- 概览（无数据） -->
           <!-- 概览（有数据） -->
           <div :style="{ display: nodata ? 'none' : 'block' }">
-            <div class="onerow"><div class="taskmain">项目概览</div></div>
+            <div class="onerow"><div class="taskmain">关卡概览</div></div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
                 <span class="nub1">{{routerInfoOverview.totalStudentCnt}}</span>
@@ -149,7 +149,7 @@
                 <div class="nub2">总完成率</div>
               </div>
             </div>
-            <div class="onerow"><div class="taskmain">阶段信息</div></div>
+            <div class="onerow"><div class="taskmain">关卡信息</div></div>
             <div class="stagemess">
               <div v-for="item in stageList" 
               :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
@@ -160,8 +160,8 @@
               <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
-              <div class="staname">阶段名称：</div>
-              <div class="stamess">管理者进阶-腾飞班1第一阶段</div>
+              <div class="staname">关卡名称：</div>
+              <div class="stamess">管理者进阶-腾飞班1第一关卡</div>
             </div>
             <div class="stagelast">
               <div class="stagepro">
@@ -546,6 +546,7 @@
                     :current="currentPage"
                     :total="tableDataTotal"
                     class="pagination"
+                    style="display:none"
                   />
                 </div>
               </div>
@@ -847,7 +848,10 @@
       <!-- 导入学员抽屉 -->
       <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
       <!-- 学员管理查看抽屉 -->
-      <check-stu v-model:CheckStuvisible="CheckStuvisible" />
+      <check-stu 
+      v-model:CheckStuvisible="CheckStuvisible"
+      v-model:studentId="studentId"
+       />
       <!-- 面授学员抽屉 -->
       <face-stu v-model:FSvisible="FSvisible" />
       <!-- 活动考勤抽屉 -->
@@ -871,8 +875,9 @@
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs,onMounted } from "vue";
-import { message } from "ant-design-vue";
+import { ref, reactive, toRefs,onMounted, createVNode } from "vue";
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { message, Modal } from "ant-design-vue";
 import PathAddStu from "../../components/drawers/pathStuAdd";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import CheckStu from "../../components/drawers/CheckStu";
@@ -921,6 +926,7 @@ export default {
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      studentId:null,
       // 共享文档列表
       docList:[
         {
@@ -1012,80 +1018,7 @@ export default {
         //   test: 1,
         // },
       ],
-      tableData: [
-        {
-          key: 1,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 2,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 3,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 4,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡1",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 5,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡1",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 6,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 7,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 8,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-      ],
+      tableData: [],
     });
 
     const levelList = reactive({
@@ -1108,11 +1041,11 @@ export default {
       stageList: [ // 阶段列表
         {
           stageId:1,
-          stage:"阶段一"
+          stage:"关卡一"
         },
         {
           stageId:2,
-          stage:"阶段二"
+          stage:"关卡二"
         }
       ]
     })
@@ -1200,7 +1133,7 @@ export default {
                 <div class="opacation">
                   <span
                     onClick={() => {
-                      showCheckStu();
+                      showCheckStu(text.record.studentId);
                     }}
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                   >
@@ -1216,7 +1149,7 @@ export default {
                     调整
                   </span>
                   <span style="color:#4EA6FF;cursor:pointer"
-                  onClick={() => {myDelStudent}}
+                  onClick={() => {delConfirm(text.record.studentId)}}
                   >删除</span>
                 </div>
               </div>
@@ -1248,8 +1181,9 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-    const showCheckStu = () => {
+    const showCheckStu = (id) => {
       state.CheckStuvisible = true;
+      state.studentId = id;
     };
     const showbtn = () => {
       state.twobtn = false;
@@ -1329,32 +1263,44 @@ export default {
     const getStudent = () => {
       let obj = {
         name: "",
-        pageNo: 0,
-        pageSize: 0,
-        routerId: state.routerId,
+        pageNo: 1,
+        pageSize: 10,
+        routerId: 100,
       };
       api
         .getStudent(obj)
         .then((res) => {
           console.log("获取学员列表", res);
+          let data = res.data.data.rows || null;
+          state.tableData = []
+          if(data.length){
+            for(let i in data) {
+              let _time = new Date(data[i].beginStudyTime*1000);
+              state.tableData.push({
+                key:i+1,
+                com:data[i].userInfoBo.deptName,
+                name:data[i].userInfoBo.userName,
+                gang:data[i].userInfoBo.jobName,
+                cur:data[i].currentChapterName || '0',
+                jin:data[i].completeChapterCnt+'/'+ data[i].totalChapterCnt,
+                time:_time.toLocaleDateString(),
+                studentId:data[i].studentId,
+              })
+              
+              // state.tableData[i].key = i+1;
+              // state.tableData[i].com = data[i].userInfoBo.deptName;
+              // state.tableData[i].name = data[i].userInfoBo.userName
+              // state.tableData[i].gang = data[i].userInfoBo.jobName
+              // state.tableData[i].cur = data[i].currentChapterName || '0'
+              // state.tableData[i].jin = data[i].completeChapterCnt+'/'+ data[i].totalChapterCnt
+              // state.tableData[i].time = _time.toLocaleDateString()
+            }
+          }
         })
         .catch((err) => {
           console.log("获取学员列表失败", err);
         });
     };
-    const myDelStudent = () => {
-      let obj = {
-        "routerId": 0,
-        "studentIds": []
-      };
-      api.methods(obj).then(res => {
-        message.success("删除成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("删除失败"+err)
-        console.log(err)
-      })
-    }
   const checkType = (type) => {
     let typeRules = [
         "",
@@ -1436,6 +1382,25 @@ export default {
       }
     };
 
+    const delConfirm = (id) => {
+        Modal.confirm({
+        title: '是否确认删除',
+        icon: createVNode(ExclamationCircleOutlined),
+        content: '',
+        okText: '确认',
+        cancelText: '取消',
+        onOk(){
+          api.delStudent({routerId:100,studentIds:[id]}).then(res => {
+          message.success("删除成功")
+          console.log(res)
+        }).catch(err => {
+          message.error("删除失败"+err)
+          console.log(err)
+        })
+        }
+      });
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -1465,7 +1430,7 @@ export default {
       changeTabs,
       checkType,
       handleChange,
-      myDelStudent,
+      delConfirm,
     };
   },
 };

From 6360034221856e36e4d87fe2b018b97f83606304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Tue, 15 Nov 2022 10:19:04 +0800
Subject: [PATCH 41/90] =?UTF-8?q?feat:=E5=85=B3=E5=8D=A1=20=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=20=E5=BF=85=E9=80=89=E4=BF=AE=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexTaskadd.js                   |   3 +
 src/views/learningpath/LevelAddDetail.vue |  90 ++++++----
 src/views/projectcenter/TaskAdd.vue       | 193 ++++++++++++----------
 3 files changed, 168 insertions(+), 118 deletions(-)

diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index ac0f16bf..dc6a6bcb 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -15,3 +15,6 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa
 
 //新建或编辑项目
 export const editProj = (obj) => http.post('/admin/project/edit', obj)
+
+//路径图里的新建或编辑关卡任务
+export const editTask = (obj) => http.post('/admin/router/editTask', obj)
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 81a71774..aea37d17 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -296,7 +296,6 @@
               v-model:routerTaskId="routerTaskId"
               v-model:edit="edit"
               v-model:EditLiveId="EditLiveId"
-             
             />
           </div>
           <div class="lin"></div>
@@ -319,7 +318,6 @@
               v-model:routerTaskId="routerTaskId"
               v-model:edit="edit"
               v-model:EditRefId="EditRefId"
-             
             />
           </div>
           <div class="lin"></div>
@@ -342,7 +340,6 @@
               v-model:chooseStageId="chooseStageId"
               v-model:routerTaskId="routerTaskId"
               v-model:EditDiscussId="EditDiscussId"
-             
             />
           </div>
           <div class="lin"></div>
@@ -584,10 +581,10 @@
                       <div class="opacationt clearfix">
                         <a-switch
                           style="margin-left: -50px; margin-top: 3px"
-                          :checked="element.checked1"
+                          v-model:checked="element.checked1"
                           size="small"
                           active-color="red"
-                          @click="changeCourseType(element.id)"
+                          @click="changeCourseType(element)"
                         />
                         <div class="showt clearfix">
                           <div
@@ -834,7 +831,6 @@
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
     <!-- 添加讨论侧弹窗 -->
- 
 
     <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
@@ -867,7 +863,7 @@
         </div>
       </div>
     </a-modal>
-   
+
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -921,6 +917,7 @@ import { message } from "ant-design-vue";
 import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
+import { editTask } from "../../api/indexTaskadd";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -949,7 +946,7 @@ export default {
           name: "默认关卡",
         },
       ],
-  
+
       tableData: [
         {
           key: 1,
@@ -1150,15 +1147,15 @@ export default {
       editID: "", // 要编辑的任务id
       EditWorkId: "", // 要编辑的 workid
       EditTestId: "",
-      EditRefId:"",
-      EditLiveId:"",
-      EditDiscussId:"",
-      EditActiveId:"",
-      EditEvalId:"",
-      EditInvistId:"",
-      EditVoteId:"",
+      EditRefId: "",
+      EditLiveId: "",
+      EditDiscussId: "",
+      EditActiveId: "",
+      EditEvalId: "",
+      EditInvistId: "",
+      EditVoteId: "",
       routerTaskId: "",
-      chapterId:"",
+      chapterId: "",
       stageId: "",
       cC: false,
       value1: "",
@@ -1181,7 +1178,7 @@ export default {
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
-  
+
     //新建关卡
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
@@ -1232,7 +1229,7 @@ export default {
     };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
-      console.log("homework==============",id,state.isactive)
+      console.log("homework==============", id, state.isactive);
       state.addhomeworkvisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
@@ -1253,8 +1250,7 @@ export default {
       // state.addinvistVisible = true;
       state.addinvistvisible = true;
       state.routerTaskId = eleId;
-      state.EditInvistId =id;
-     
+      state.EditInvistId = id;
     };
     const showDrawerAddVote = (id, eleId) => {
       // state.addhomeworkvisible = true;
@@ -1272,7 +1268,7 @@ export default {
       state.EditRefId = id;
       state.routerTaskId = eleId;
     };
-    
+
     const showDrawerAddDiscuss = (id, eleId) => {
       state.adddiscussvisible = true;
       state.EditDiscussId = id;
@@ -1300,6 +1296,10 @@ export default {
               checked1: element.flag,
               routerTaskId: element.routerTaskId,
               courseId: element.courseId,
+              stageId: element.stageId,
+              type: element.type,
+              routerId: element.routerId,
+              chapterId: element.chapterId,
             };
             array.push(obj);
           });
@@ -1347,7 +1347,7 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-   
+
     const checkType = (index) => {
       let typeRules = [
         "",
@@ -1590,7 +1590,6 @@ export default {
         });
     };
 
-   
     const closeDeleteModel = () => {
       state.deleteModal = false;
       state.deleteID = "";
@@ -1692,7 +1691,6 @@ export default {
         });
     };
 
-
     //编辑的按钮
     const decideType = (type, id, eleId) => {
       state.edit = true;
@@ -1705,22 +1703,21 @@ export default {
         showDrawerAddHomework(id, eleId);
       } else if (type == "考试") {
         showDrawerAddTest(id, eleId);
-      }else if (type == "讨论") {
+      } else if (type == "讨论") {
         showDrawerAddDiscuss(id, eleId);
-      }else if (type == "活动") {
+      } else if (type == "活动") {
         showDrawerAddActive(id, eleId);
-      }else if (type == "测评") {
-        showDrawerAddInvist (id, eleId);
-      }else if (type == "评估") {
-        showDrawerAddEval (id, eleId);
-      }
-      else if (type == "投票") {
+      } else if (type == "测评") {
+        showDrawerAddInvist(id, eleId);
+      } else if (type == "评估") {
+        showDrawerAddEval(id, eleId);
+      } else if (type == "投票") {
         showDrawerAddVote(id, eleId);
       }
     };
     //删除关卡
     const deleteChapter = (chapterId) => {
-      console.log('chapterId',chapterId)
+      console.log("chapterId", chapterId);
       let obj = {
         chapterId: chapterId,
       };
@@ -1733,6 +1730,32 @@ export default {
           console.log("删除关卡失败", err);
         });
     };
+
+    const changeCourseType = (ele) => {
+      console.log("任务id", ele.id);
+      console.log("flag", ele.checked1);
+      let obj = {
+        chapterId: ele.chapterId,
+        courseId: ele.courseId,
+        duration: ele.cretime,
+        flag: ele.checked1,
+        name: ele.creater,
+        routerId: ele.routerId,
+        routerTaskId: ele.routerTaskId,
+        type: ele.type,
+      };
+      editTask(obj)
+        .then((res) => {
+          console.log(`修改状态成功${res.data}`);
+          message.destroy();
+          message.success("修改成功");
+        })
+        .catch((err) => {
+          console.log(`修改状态失败${err.data}`);
+          message.destroy();
+          message.warning("修改失败");
+        });
+    };
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1774,6 +1797,7 @@ export default {
       decideType,
       updateTableData,
       deleteChapter,
+      changeCourseType,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 0a0cf6a0..9607571d 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -326,8 +326,8 @@
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
                 v-model:EditVoteId="EditVoteId"
-                v-model:voteId = "voteId"
-                v-model:ballotId = "ballotId"
+                v-model:voteId="voteId"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -495,10 +495,10 @@
                         <div class="opacationt clearfix">
                           <a-switch
                             style="margin-left: -50px; margin-top: 3px"
-                            :checked="element.checked1"
+                            v-model:checked="element.checked1"
                             size="small"
                             active-color="red"
-                            @click="changeCourseType(element.id)"
+                            @click="changeCourseType(element)"
                           />
                           <div class="showt clearfix">
                             <div
@@ -951,15 +951,15 @@ export default {
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的ids
       deAll: false,
-      EditDiscussId:null,//要编辑的讨论的id
-      EditActiveId:null,//要编辑的活动id
-      EditWorkId:null, // 要编辑的作业id
-      EditTestId: null,// 要编辑的考试id
-      EditEvalId:null,
-      EditInvistId:null,
+      EditDiscussId: null, //要编辑的讨论的id
+      EditActiveId: null, //要编辑的活动id
+      EditWorkId: null, // 要编辑的作业id
+      EditTestId: null, // 要编辑的考试id
+      EditEvalId: null,
+      EditInvistId: null,
       EditVoteId: null, //编辑需要投票的id
       ballotId: "", //编辑需要的题干id
-      projectTaskId:null, // 要编辑的具体任务id
+      projectTaskId: null, // 要编辑的具体任务id
       projectNameList: [
         {
           id: 1,
@@ -1192,6 +1192,9 @@ export default {
           checked1: value.flag ? true : false,
           checked: false, //是否选中类型
           courseId: value.courseId,
+          projectId: value.projectId,
+          stageId: value.stageId,
+          type: value.type,
         };
         array.push(obj);
       });
@@ -1382,8 +1385,6 @@ export default {
         });
     };
 
-
-
     //获取修改、删除id（投票)
     const changeVData = (data) => {
       console.log("获取修改、删除id投票", data);
@@ -1554,7 +1555,7 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
-      console.log(id, eleId, '95835325932953295325');
+      console.log(id, eleId, "95835325932953295325");
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
@@ -1644,8 +1645,31 @@ export default {
       state.selectRow = array;
     };
     //修改任务的课程类型 id为任务id
-    const changeCourseType = (id) => {
-      console.log("任务id", id);
+    const changeCourseType = (ele) => {
+      console.log("任务id", ele.id);
+      console.log("flag", ele.checked1);
+      let obj = {
+        courseId: ele.courseId,
+        duration: ele.cretime == "-" ? 0 : ele.cretime,
+        flag: ele.checked1,
+        name: ele.creater,
+        projectId: ele.projectId,
+        projectTaskId: ele.id,
+        stageId: ele.stageId,
+        type: ele.type,
+      };
+      api
+        .addTask(obj)
+        .then((res) => {
+          console.log(`修改状态成功${res.data}`);
+          message.destroy();
+          message.success("修改成功");
+        })
+        .catch((err) => {
+          console.log(`修改状态失败${err.data}`);
+          message.destroy();
+          message.warning("修改失败");
+        });
     };
 
     //打开测评的弹窗
@@ -1681,10 +1705,10 @@ export default {
       }
     };
     const showdeAll = () => {
-      if(state.selectRow.length==0){
-        message.destroy()
-        return message.warning("请选择要删除的任务")
-      }else{
+      if (state.selectRow.length == 0) {
+        message.destroy();
+        return message.warning("请选择要删除的任务");
+      } else {
         state.deAll = true;
       }
     };
@@ -1888,75 +1912,74 @@ export default {
     }
   }
 
-.name {
-  width: 78%;
-  // background-color: lightcoral;
-  display: flex;
-  margin-top: 20px;
-  align-items: center;
-  //height: 40px;
-  // border: 1px solid black;
-  .namebox {
-    width: 120px;
+  .name {
+    width: 78%;
+    // background-color: lightcoral;
     display: flex;
+    margin-top: 20px;
     align-items: center;
-    justify-content: flex-end;
-    flex-shrink: 0;
-    .nameimg {
-      width: 10px;
-      height: 10px;
+    //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;
+      }
+    }
+    .d {
+      margin-top: 8px;
+      font-size: 25px;
+      color: #ff4e4e;
+    }
+    .box {
+      position: relative;
+      margin-left: 14px;
+      .box1 {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        width: 50px;
+        margin-left: -25px;
+        margin-top: -5px;
+        border-top: 2px solid rgba(78, 166, 255, 1);
+      }
+      .box2 {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        height: 50px;
+        //margin-left: -5px;
+        margin-top: -25px;
+        border-left: 2px solid rgba(78, 166, 255, 1);
+      }
+    }
+    .inname {
+      color: #000000;
+      font-size: 14px;
+      margin-left: 7px;
+    }
+    .in {
+      margin-left: 14px;
+      flex: 1;
+      // .ant-radio-wrapper {
+      // }
+      .ant-input-affix-wrapper {
+        width: 384px;
+        border-radius: 8px;
+      }
+      .ant-input {
+        border-radius: 8px;
+        // height: 120%;
+        //width: 384px;
+        height: 30px;
+      }
     }
   }
-  .d {
-    margin-top: 8px;
-    font-size: 25px;
-    color: #ff4e4e;
-  }
-  .box {
-    position: relative;
-    margin-left: 14px;
-    .box1 {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 50px;
-      margin-left: -25px;
-      margin-top: -5px;
-      border-top: 2px solid rgba(78, 166, 255, 1);
-    }
-    .box2 {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      height: 50px;
-      //margin-left: -5px;
-      margin-top: -25px;
-      border-left: 2px solid rgba(78, 166, 255, 1);
-    }
-  }
-  .inname {
-    color: #000000;
-    font-size: 14px;
-    margin-left: 7px;
-  }
-  .in {
-    margin-left: 14px;
-    flex: 1;
-    // .ant-radio-wrapper {
-    // }
-    .ant-input-affix-wrapper {
-      width: 384px;
-      border-radius: 8px;
-    }
-    .ant-input {
-      border-radius: 8px;
-      // height: 120%;
-      //width: 384px;
-      height: 30px;
-    }
-  }
-}
-
 }
 .moveModal {
   .ant-modal {

From 3efc67ce7ad0caf659f3338576152d2ef79cb9be Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:48:53 +0800
Subject: [PATCH 42/90] =?UTF-8?q?feat:=E6=A8=A1=E4=BB=BF=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9C=A8=E7=BA=BF=E6=8A=BD=E5=B1=89=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue | 378 ++++++++++++++++-----------
 src/views/projectcenter/TaskAdd.vue  |  20 +-
 2 files changed, 237 insertions(+), 161 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index a7b5e9bb..ec1fa777 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -8,8 +8,9 @@
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">
-        <div class="headerTitle">添加在线</div>
+      <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"
@@ -23,7 +24,7 @@
               <div class="ipt_name">课程编号：</div>
               <div class="fi_input">
                 <a-input
-                  v-model:value="value1"
+                  v-model:value="inputV1"
                   style="width: 240px; height: 40px; border-radius: 8px"
                   placeholder="请输入项目名称"
                 />
@@ -48,7 +49,7 @@
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="resetInvist">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -75,11 +76,14 @@
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
             "
             :row-selection="rowSelection"
-            :columns="columns1"
-            :data-source="tableData1"
+            :columns="tableDataFunc()"
+            :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
         		this.getMilitaryDeployment()
+              @expand="expandTable"
             :pagination="false"
+              filterMultiple:false
           />
           <div class="pa">
                 <a-pagination
@@ -90,85 +94,25 @@
                   :current="currentPage"
                   :total="tableDataTotal"
                   class="pagination"
+                  @change="handelChangePage"
                 />
               </div>
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
-const options1 = ref([
-  {
-    value: "value1",
-    label: "请选择状态",
-  },
-]);
-const columns1 = [
-  {
-    title: "课程编号",
-    width: "20%",
-    dataIndex: "num",
-    key: "num",
-    align: "center",
-  },
-  {
-    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);
-  },
-});
+import { reactive, toRefs, onMounted } from "vue";
+import * as api from "../../api/indexInvist.js";
+import * as apiTask from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
 export default {
   name: "AddOnline",
   props: {
@@ -176,109 +120,227 @@ export default {
       type: Boolean,
       default: false,
     },
+    EditInvistId: {
+      type: Number,
+      default: null,
+    },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      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({
-      tableData1: [
+      inputV1:"",
+      options1 : [
         {
-          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",
+          value: "value1",
+          label: "未完成",
         },
       ],
+      time: undefined,
+      assessmentId:null,
+      assessmentName:"",
+      tableData: [ ],
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       pageSize: 10,
     });
     const closeDrawer = () => {
       ctx.emit("update:addonlineVisible", false);
+      ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
+    const tableDataFunc = () => {
+      const columns = [
+      {
+          title: "课程编号",
+          dataIndex: "num",
+          key: "num",
+          width: "200px",
+          align: "center",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: "100px",
+          align: "left",
+          className: "classify",
+        }, {
+          title: "内容分类",
+          dataIndex: "content",
+          key: "content",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "授课教师",
+          dataIndex: "teacher",
+          key: "teacher",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creator",
+          key: "creator",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "完成时间",
+          dataIndex: "time",
+          key: "time",
+          width: "200px",
+          align: "center",
+        },
+      ];
+      return columns;
+    };
+    const rowSelection = {
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "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) => {
+        let obj = {
+          key: index,
+          assessmentId: value.assessmentId,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+    };
+    //获取全部在线信息接口
+    const getAllInvistText = () => {
+      api
+        .queryAssessmentDetailList({
+          assessmentName: "",
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
+        })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            // console.log("获取在线信息", res.data.data);
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部在线信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
+  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: 1,
+            })
+              .then((res) => {
+                console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+                closeDrawer();
+                state.addLoading = false;               
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+      }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: 1,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后111", res.data, 11111);
+              ctx.emit("changeData", false); 
+              closeDrawer();    
+            })
+            .catch((err) => {
+              console.log(err, 111111);
+            });
+      }
+    }
+    //重置在线信息
+    const resetInvist = () => {
+      state.inputV1 = "";
+      getAllInvistText();
+    };
+    onMounted(() => {
+      // createInvist();
+      getAllInvistText();
+    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      options1,
-      columns1,
+      tableDataFunc,
       rowSelection,
+      handelChangePage,
+      getTableDate,
+      updateTask,
+      resetInvist,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index cb6a6a98..fb7cb860 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -97,7 +97,14 @@
           </div>
           <!-- 添加在线侧弹窗 -->
           <div>
-            <add-online v-model:addonlineVisible="addonlinevisible" />
+            <add-online 
+            v-model:addonlineVisible="addonlinevisible" 
+            @changeData="updateTableData"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:projectTaskId="projectTaskId"
+              v-model:EditOnlineId = "EditOnlineId"/>
           </div>
           <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
@@ -925,7 +932,9 @@ export default {
       EditActiveId:null,//要编辑的活动id
       EditWorkId:null, // 要编辑的作业id
       EditTestId: null,// 要编辑的考试id
+      EditOnlineId:null, //要编辑的在线id
       EditEvalId:null,
+      evaluationId: null, //编辑需要的id
       EditInvistId:null,
       EditVoteId: null, //编辑需要投票的id
       ballotId: "", //编辑需要的题干id
@@ -1471,8 +1480,10 @@ export default {
       document.getElementsByTagName("main")[0].style.boxShadow =
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
-    const showDrawerOnline = () => {
+    const showDrawerOnline = (id, eleId) => {
       state.addonlinevisible = true;
+      state.EditOnlineId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerFaceteach = () => {
       state.addfaceteachvisible = true;
@@ -1514,15 +1525,16 @@ export default {
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
+      // state.EditEvalId = id;
       state.evaluationId = id;
       state.projectTaskId = eleId;
     };
     const showDrawerAddInvist = (id, eleId) => {
+      console.log(id, eleId, '213312');
       state.addinvistvisible = true;
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
-      console.log(id, eleId, '95835325932953295325');
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
@@ -1645,6 +1657,8 @@ export default {
         showDrawerAddHomework(id, eleId);
       } else if (type == "考试") {
         showDrawerAddTest(id, eleId);
+      } else if (type == "在线") {
+        showDrawerOnline(id, eleId);
       }
     };
     return {

From 633ec2d6bfc8876921323de49a235a73235315ca Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 15 Nov 2022 12:50:02 +0800
Subject: [PATCH 43/90] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=88=86=E6=8A=BD=E5=B1=89=E7=9A=84margintop=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue    |   1 +
 src/components/drawers/AddCase.vue      | 487 ++++++++++++++----------
 src/components/drawers/AddDiscuss.vue   |   1 +
 src/components/drawers/AddEval.vue      |   1 +
 src/components/drawers/AddFaceteach.vue | 181 +++++----
 src/components/drawers/AddHomework.vue  |   1 +
 src/components/drawers/AddInvist.vue    |   1 +
 src/components/drawers/AddLive.vue      |   1 +
 src/components/drawers/AddOnline.vue    |  18 +-
 src/components/drawers/AddTest.vue      |   5 +-
 src/components/drawers/AddVote.vue      |   1 +
 src/components/drawers/CreVote.vue      |   1 +
 src/views/projectcenter/TaskAdd.vue     |  10 +-
 13 files changed, 418 insertions(+), 291 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index fb0719f1..41bcf8ed 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -509,6 +509,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 93ad2825..4c06bb5d 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -1,210 +1,300 @@
 <template>
-    <a-drawer
-      :visible="addcaseVisible"
-      class="drawerStyle addcaseDrawer"
-      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="inputV1"
-                    style="width: 264px; 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
-              class="ant-table-striped"
-              :row-class-name="
-                (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-              "
-              :row-selection="rowSelection"
-              :columns="columns1"
-              :data-source="tableData1"
-              :loading="tableDataTotal === -1 ? true : false"
-              :pagination="false"
-            />
-            <div class="pa">
-                <a-pagination
-                  showSizeChanger="true"
-                  showQuickJumper="true"
-                  hideOnSinglePage="true"
-                  :pageSize="pageSize"
-                  :current="currentPage"
-                  :total="tableDataTotal"
-                  class="pagination"
+  <a-drawer
+    :visible="addcaseVisible"
+    class="drawerStyle addcaseDrawer"
+    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_items">
+          <div class="mi_ipts">
+            <div class="mii_ipt">
+              <div class="ipt_name">案例标题：</div>
+              <div class="fi_input">
+                <a-input
+                  v-model:value="inputV1"
+                  style="width: 264px; height: 40px; border-radius: 8px"
+                  placeholder="请输入项目名称"
                 />
               </div>
+            </div>
           </div>
-        </div>
-        <div class="main_btns">
-          <button class="btn1">取消</button>
-          <button class="btn2">确定</button>
+          <div class="mi_btns">
+            <div class="btn btn1">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btn btn2" @click="resetCase()">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+            </div>
+            </div>
+            
+            <div class="main_table">
+              <a-table class="ant-table-striped" :row-class-name="
+                            (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
+                          " :row-selection="rowSelection" :columns="tableDataFunc()" :data-source="tableData"
+                :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" this.getMilitaryDeployment()
+                @expand="expandTable" :pagination="false" filterMultiple:false
+          />
+          <div class="pa">
+              <a-pagination
+                showSizeChanger="true"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+                @change="handelChangePage"
+              />
+            </div>
         </div>
       </div>
-    </a-drawer>
-  </template>
-  <script>
-  import { reactive, toRefs, ref } from "vue";
-  const columns1 = [
-    {
-      title: "案例标题",
-      width: "40%",
-      dataIndex: "title",
-      key: "num",
-      align: "center",
-      ellipsis: true,
+      <div class="main_btns">
+        <button class="btn1" @click="closeDrawer">取消</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.js";
+import * as apiTask from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
+
+export default {
+  name: "AddCase",
+  props: {
+    addcaseVisible: {
+      type: Boolean,
+      default: false,
     },
-    {
-      title: "作者",
-      width: "25%",
-      dataIndex: "name",
-      key: "name",
-      align: "center",
+    EditCaseId: {
+      type: Number,
+      default: null,
     },
-    {
-      title: "导入时间",
-      width: "35%",
-      dataIndex: "time",
-      key: "time",
-      align: "center",
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
     },
-  ];
-  const rowSelection = ref({
-    checkStrictly: false,
-    onChange: (selectedRowKeys, selectedRows) => {
-      console.log(
-        `selectedRowKeys: ${selectedRowKeys}`,
-        "selectedRows: ",
-        selectedRows
-      );
+    projectId: {
+      type: Number,
+      default: null,
     },
-    onSelect: (record, selected, selectedRows) => {
-      console.log(record, selected, selectedRows);
+    chooseStageId: {
+      type: Number,
+      default: null,
     },
-    onSelectAll: (selected, selectedRows, changeRows) => {
-      console.log(selected, selectedRows, changeRows);
+    routerTaskId: {
+      type: Number,
+      default: 0,
     },
-  });
-  export default {
-    name: "AddCase",
-    props: {
-      addcaseVisible: {
-        type: Boolean,
-        default: false,
+    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({
+      tableData: [
+        {
+          key: "1",
+          title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
+          name: "李玉冰",
+          time: "2022-10-31  23:12:00",
+        },
+      ],
+      currentPage: 1,
+      tableDataTotal: 0,
+      pageSize: 10,
+      inputV1: '',
+      time: undefined,
+      assessmentId: null,
+      assessmentName: "",
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:addcaseVisible", false);
+      ctx.emit("update:edit", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+    const tableDataFunc = () => {
+      const columns = [
+        {
+          title: "案例标题",
+          dataIndex: "tit",
+          key: "tit",
+          width: "400px",
+          align: "center",
+        },
+        {
+          title: "作者",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: "100px",
+          align: "center",
+          className: "classify",
+        },
+        {
+          title: "导入时间",
+          dataIndex: "time",
+          key: "time",
+          width: "200px",
+          align: "center",
+        },
+      ];
+      return columns;
+    };
+    const rowSelection = {
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+        console.log(selectedRows.assessmentId);
+        state.assessmentId = selectedRows.assessmentId;
+        state.assessmentName = selectedRows.name;
       },
-    },
-    setup(props, ctx) {
-      const state = reactive({
-        tableData1: [
-          {
-            key: "1",
-            title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "2",
-            title: "OEM 企业一线用工之路探索",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "3",
-            title: " 销售数字化转型的痛苦与探索",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "4",
-            title: "疫情突发，技能人才招聘的相关…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "5",
-            title: "设计效率提升之工具化",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "6",
-            title: "疫情突发，技能人才招聘的相关…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "7",
-            title: "基于BOE显示PNL工厂的工序平…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "8",
-            title: "基于BOE显示PNL工厂的工序平…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "9",
-            title: "基于BOE显示PNL工厂的工序平…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-        ],
-        currentPage: 1,
-        tableDataTotal: 100,
-        pageSize: 10,
-        inputV1:'',
+    };
+    const handelChangePage = (page, pageSize) => {
+      state.currentPage = page;
+      state.pageSize = pageSize;
+      getAllCaseText();
+    };
+    const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        let obj = {
+          key: index,
+          assessmentId: value.assessmentId,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+        };
+        array.push(obj);
       });
-      const closeDrawer = () => {
-        ctx.emit("update:addcaseVisible", false);
-      };
-      const afterVisibleChange = (bool) => {
-        console.log("state", bool);
-      };
-      return {
-        ...toRefs(state),
-        afterVisibleChange,
-        closeDrawer,
-        columns1,
-        rowSelection,
-      };
-    },
-  };
-  </script>
-  <style lang="scss">
-  .ant-table-striped :deep(.table-striped) td {
+      state.tableData = array;
+    };
+    //获取全部案例信息接口
+    const getAllCaseText = () => {
+      api
+        .queryAssessmentDetailList({
+          assessmentName: "",
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
+        })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            // console.log("获取案例信息", res.data.data);
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部在线信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
+    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: 3,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } 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: 3,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      }
+    }
+    //重置案例信息
+    const resetCase = () => {
+      state.inputV1 = "";
+      getAllCaseText();
+    };
+    onMounted(() => {
+      // createCase();
+      getAllCaseText();
+    });
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      tableDataFunc,
+      rowSelection,
+      handelChangePage,
+      getTableDate,
+      updateTask,
+      getAllCaseText,
+      resetCase,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
     background-color: #fafafa !important;
   }
   
@@ -226,9 +316,12 @@
         }
       }
       .contentMain {
-        .main_items {
-          display: flex;
-          justify-content: space-between;
+        padding-right: 15px;
+        
+          .main_items {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 32px;
           margin-bottom: 12px;
           flex-wrap: wrap;
           .mi_ipts {
@@ -381,4 +474,4 @@
       }
     }
   }
-  </style>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index b2166686..357bd86f 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -300,6 +300,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 06daaada..9221e473 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -322,6 +322,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index cd42ca90..e8687d52 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -400,99 +400,116 @@ export default {
         .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;
-            }
-          }
-        }
-        .main_item2 {
-          display: flex;
-          align-items: flex-start;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
-            display: flex;
-            justify-content: end;
-            align-items: center;
-          }
-          .kqszbox {
-            .qdqtbox {
-              margin-left: 5px;
-              cursor: pointer;
-            }
-            .qdbtn,
-            .qtbtn {
-              width: 75px;
-              height: 24px;
-              background: rgba(56, 139, 225, 0.16);
-              border-radius: 2px;
-              border: 1px solid #387df7;
+          margin-top: 32px;
+            margin-bottom: 32px;
+          
+            .signbox {
+              width: 120px;
               display: flex;
+              justify-content: end;
               align-items: center;
-              justify-content: center;
-              .btntext {
-                color: #387df7;
+          
+              .sign {
+                margin-right: 5px;
               }
             }
-            .setbox {
+          
+            .btnbox {
               display: flex;
-              flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
-              .timerbox {
-                margin-top: 6px;
-                margin-right: 32px;
+              flex: 1;
+              align-items: center;
+          
+              .xkbtn {
+                cursor: pointer;
+                width: 130px;
+                height: 40px;
+                background: #388be1;
+                border-radius: 8px;
+                border: 0;
+                margin-right: 8px;
+                color: #fff;
+              }
+            }
+          }
+          
+          .main_item2 {
+            display: flex;
+            align-items: flex-start;
+            margin-bottom: 32px;
+          
+            .signbox {
+              width: 120px;
+              display: flex;
+              justify-content: end;
+              align-items: center;
+            }
+          
+            .kqszbox {
+              .qdqtbox {
+                margin-left: 5px;
+                cursor: pointer;
+              }
+          
+              .qdbtn,
+              .qtbtn {
+                width: 75px;
+                height: 24px;
+                background: rgba(56, 139, 225, 0.16);
+                border-radius: 2px;
+                border: 1px solid #387df7;
                 display: flex;
                 align-items: center;
-                flex-wrap: nowrap;
+                justify-content: center;
+          
+                .btntext {
+                  color: #387df7;
+                }
+              }
+          
+              .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;
               }
             }
           }
-          .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_right {
-        width: 337px;
-        .main_item {
-          display: flex;
-          align-items: center;
+          
+          .main_right {
+            width: 337px;
+          
+            .main_item {
+              display: flex;
+              align-items: center;
+              margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index c3c75f15..71990ad7 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -488,6 +488,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
 
           .signbox {
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index dc7e3929..9d64ac8b 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -333,6 +333,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .fi_input {
             margin-right: 20px;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 43904a80..22c24f58 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -701,6 +701,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index ec1fa777..34b6b274 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -49,7 +49,7 @@
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btn btn2" @click="resetInvist">
+            <div class="btn btn2" @click="resetOnline()">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -241,7 +241,7 @@ export default {
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
-      getAllInvistText();
+      getAllOnlineText();
     };
     const getTableDate = (tableData) => {
       let data = tableData;
@@ -260,7 +260,7 @@ export default {
       state.tableData = array;
     };
     //获取全部在线信息接口
-    const getAllInvistText = () => {
+    const getAllOnlineText = () => {
       api
         .queryAssessmentDetailList({
           assessmentName: "",
@@ -323,13 +323,13 @@ export default {
       }
     }
     //重置在线信息
-    const resetInvist = () => {
+    const resetOnline = () => {
       state.inputV1 = "";
-      getAllInvistText();
+      getAllOnlineText();
     };
     onMounted(() => {
-      // createInvist();
-      getAllInvistText();
+      // createOnline();
+      getAllOnlineText();
     });
     return {
       ...toRefs(state),
@@ -338,9 +338,10 @@ export default {
       tableDataFunc,
       rowSelection,
       handelChangePage,
+      getAllOnlineText,
       getTableDate,
       updateTask,
-      resetInvist,
+      resetOnline,
     };
   },
 };
@@ -371,6 +372,7 @@ export default {
         .main_items {
           display: flex;
           justify-content: space-between;
+          margin-top: 32px;
           margin-bottom: 12px;
           flex-wrap: wrap;
           .mi_ipts {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index a56544a7..536a3db6 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -200,7 +200,7 @@
       </div>
   </a-drawer>
 </template>
-  <script>
+<script>
 import { reactive, ref, toRefs } from "vue";
 import {message} from"ant-design-vue";
 import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
@@ -628,7 +628,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -659,6 +659,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index 9986004b..671dbed8 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -477,6 +477,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index a0e4dbf8..38298648 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -435,6 +435,7 @@ export default {
       .main_item {
         display: flex;
         align-items: center;
+          margin-top: 32px;
         margin-bottom: 32px;
         .signbox {
           width: 120px;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index bfa79cc6..e8c2d4e6 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -132,7 +132,9 @@
           </div>
           <!-- 添加案例侧弹窗 -->
           <div>
-            <add-case v-model:addcaseVisible="addcasevisible" />
+            <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
+              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+              v-model:EditCaseId="EditCaseId" />
           </div>
           <!-- 添加案例侧弹窗 -->
           <div class="lin"></div>
@@ -962,6 +964,8 @@ export default {
       EditActiveId: null, //要编辑的活动id
       EditWorkId: null, // 要编辑的作业id
       EditTestId: null, // 要编辑的考试id
+      EditCaseId:null,//要编辑的案例id
+      EditOnlineId:null,//要编辑的在线id
       EditEvalId: null,
       EditInvistId: null,
       EditVoteId: null, //编辑需要投票的id
@@ -1519,8 +1523,10 @@ export default {
     const showDrawerFaceteach = () => {
       state.addfaceteachvisible = true;
     };
-    const showDrawerAddCase = () => {
+    const showDrawerAddCase = (id, eleId) => {
       state.addcasevisible = true;
+      state.EditCaseId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerAddHomework = (id, eleId) => {
       state.EditWorkId = id;

From f8d1a5c779cd419e022952a643bf430b1ed02c44 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 15 Nov 2022 20:02:20 +0800
Subject: [PATCH 44/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                        |    8 +-
 src/api/method.js                       |  203 +++
 src/components/TwoDimensionalCode.vue   |  229 ++-
 src/components/drawers/OwnPower.vue     |  723 +-------
 src/views/learningpath/LearningPath.vue |   10 +-
 src/views/projectcenter/ProjectAdd.vue  | 2152 +++++++++++++----------
 src/views/projectcenter/TaskPage.vue    |   43 +-
 src/views/system/SystemManage.vue       |    4 +-
 8 files changed, 1590 insertions(+), 1782 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 2ccc90d6..1bfecc7f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-09 09:32:35
+ * @LastEditTime: 2022-11-15 16:43:26
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -64,8 +64,8 @@ export const handleProject = (obj) => http.post('/admin/project/handle', obj)
 export const taskStudentList = (obj) => http.post('/admin/project/taskStudentList', obj)
 
 
-
-
-
 //获取讨论信息
 export const getDiscussDetail=(obj)=>http.post('/discuss/getDiscussDetail',obj)
+
+//获取模版列表
+export const getTemplate=(obj)=>http.post('/admin/project/template/list',obj)
diff --git a/src/api/method.js b/src/api/method.js
index 21d43e0c..4fb3d4ff 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -165,9 +165,212 @@ function autoComma(number) {
 const commonData={
 	timeout:50
 }
+
+
+//组织树
+const  organizationalTree= [
+	{
+		title: "京东方",
+		value: "京东方",
+		children: [
+			{
+				title: "产研部",
+				value: "产研部",
+				children: [
+					{
+						title: "产品部",
+						value: "产品部",
+					},
+					{
+						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",
+					},
+				],
+			},
+			{
+				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: "行政部",
+						value: "行政部",
+					},
+				],
+			},
+		],
+	},
+]
 export {
 	toDate,
 	getWeek,
 	autoComma,
 	commonData,
+	organizationalTree,
 }
\ No newline at end of file
diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index 4808d440..170693cf 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -7,25 +7,45 @@
       :closable="closableQR"
       wrapClassName="codeModal"
       style="margin-top: 400px"
-      :zIndex="9999"
+      :zIndex="999"
       @cancel="qr_exit"
     >
       <div id="qrcode" class="QR">
         <div class="qr_header"></div>
         <div class="qr_main">
           <div class="qrm_header">
-            <span style="title">{{codeInfo.title?codeInfo.title:''}}</span>
+            <span style="title">{{
+              codeInfo.title ? codeInfo.title : ""
+            }}</span>
             <div class="close_exit" @click="closeCodeModal"></div>
           </div>
-          <div class="qrm_body">
-            <div class="codename">{{codeInfo.name?codeInfo.name:''}}</div>
-            <qrcode-vue
-              :value="codeInfo.url?codeInfo.url:''"
-              :size="qrcodeSize"
-              style="width: 200px; height: 200px"
-            ></qrcode-vue>
+          <div class="downloadCode" style="">
+            <div class="qrm_body">
+              <div class="codename">
+                {{ codeInfo.name ? codeInfo.name : "" }}
+              </div>
+              <qrcode-vue
+                :value="codeInfo.url ? codeInfo.url : ''"
+                :size="qrcodeSize"
+                style="width: 200px; height: 200px"
+              ></qrcode-vue>
+            </div>
+          </div>
+          <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'none' }">
+            <div class="codeUrlLink">链接</div>
+            <a-input
+              :value="codeInfo.url ? codeInfo.url : ''"
+              disabled
+              class="codeUrlInp"
+            />
+            <a-input
+              :value="codeInfo.url ? codeInfo.url : ''"
+              id="courseUrl"
+              class="codeUrlInp"
+              style="position: absolute; opacity: 0; z-index: -1"
+            />
+            <div @click="copyUrl" class="codeUrlCopy">复制链接</div>
           </div>
-
           <div class="qrm_footer">
             <span style="margin-left: 52px">下载二维码</span>
             <div class="qrmbtn" @click="downloadQr(200)">
@@ -47,7 +67,8 @@
 <script>
 import { reactive, toRefs, watch } from "vue";
 import QrcodeVue from "qrcode.vue";
-// import html2canvas from "html2canvas";
+import html2canvas from "html2canvas";
+import { message } from "ant-design-vue";
 export default {
   name: "TwoDimensionalCode",
   components: {
@@ -64,97 +85,70 @@ export default {
         return {};
       },
     },
-     index: {
+    index: {
+      type: String,
+      default: "",
+    },
+    type: {
       type: String,
       default: "",
     },
   },
   setup(props, ctx) {
     const state = reactive({
-      qrcodeUrl: "https://www.baidu.com/",
       qrcodeSize: 800,
       codeInfo: {},
+      courseUrl: "https://www.baidu.com/",
+      showUrl: false,
     });
 
     //下载二维码图片
     const downloadQr = (num) => {
       state.qrcodeSize = num;
-      // let filename = `${new Date().getTime()}.png`;
-      // let canvas = document.getElementsByTagName("canvas")[0];
-      // let imageUrl = canvas.toDataURL("image/png");
+      html2canvas(
+        document.querySelectorAll(".downloadCode")[Number(props.index)],
+        {
+          useCORS: true, //支持图片跨域
+        }
+      ).then((canvas) => {
+        // console.log("canvas", canvas, canvas.width, canvas.style.width);
+        let filename = `${new Date().getTime()}.png`;
+        let imageUrl = canvas.toDataURL("image/png");
+        let a = document.createElement("a");
+        a.style.display = "none";
+        a.download = filename;
+        a.href = imageUrl;
+        document.body.appendChild(a);
+        a.click();
+      });
+      //           let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
+      //           let filename = `${new Date().getTime()}.png`;
+      //           let imageUrl = canvas.toDataURL("image/png");
+      //           let a = document.createElement("a");
+      //           a.style.display = "none";
+      //           a.download = filename;
+      //           a.href = imageUrl;
+      //           document.body.appendChild(a);
+      //           a.click();
+    };
+    //复制链接
+    const copyUrl = () => {
+      // const range = document.createRange(); //创建range对象
+      // 	range.selectNode(document.getElementById('courseUrl')); //获取复制内容的 id 选择器
+      // 	const selection = window.getSelection();  //创建 selection对象
+      // 	if (selection.rangeCount > 0) selection.removeAllRanges(); //如果页面已经有选取了的话，会自动删除这个选区，没有选区的话，会把这个选取加入选区
+      // 	selection.addRange(range); //将range对象添加到selection选区当中，会高亮文本块
+      // 	document.execCommand("Copy"); //复制选中的文字到剪贴板
+      // 	message.success('复制成功')
+      // 	selection.removeRange(range); // 移除选中的元素
 
-      // let canvasBox = document.createElement("canvas");
-      // let ctx = canvasBox.getContext("2d");
-      // var img = new Image();
-      // // 需要添加文字的图片
-      // img.src = imageUrl;
-      // // 等待图片加载完成
-      // img.onload = function () {
-      //   // 将图片添加到canvas
-      //   ctx.drawImage(img, 0, 0, 1240, 2208);
-      //   // 设置字体
-      //   ctx.font = "73px 微软雅黑 bolder";
-      //   // 设置字体颜色
-      //   ctx.fillStyle = "#955f17";
-      //   ctx.textAlign = "center";
-      //   // 添加文字和位置
-      //   ctx.fillText("微信名", 621, 1050);
-
-      //   // 导出为图片
-      //   let url = canvasBox.toDataURL("image/png");
-      //   let a = document.createElement("a");
-      //   a.style.display = "none";
-      //   a.download = filename;
-      //   a.href = url;
-      //   document.body.appendChild(a);
-      //   a.click();
-      // };
-
-      // // let a = document.createElement("a");
-      // // a.style.display = "none";
-      // // a.download = filename;
-      // // a.href = imageUrl;
-      // // document.body.appendChild(a);
-      // // a.click();
-
-      // html2canvas(document.querySelector("#qrcode"), {
-      //   useCORS: true, //支持图片跨域
-      // }).then((canvas) => {
-      //   // var extra_canvas = document.createElement("canvas");
-      //   //                 extra_canvas.setAttribute('width',num);
-      //   //                 extra_canvas.setAttribute('height',num);
-      //   //                 var ctx = extra_canvas.getContext('2d');
-      //   //                 ctx.drawImage(canvas,0,0,num,num);
-      //   //                 let filename = `${new Date().getTime()}.png`;
-      //   //                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
-
-      //   console.log("canvas", canvas, canvas.width, canvas.style.width);
-
-      //   // //   let ctx = canvas.getContext('2d');
-      //   // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
-      //   // //            canvas.width=num
-      //   // //  canvas.height=num
-      //   // //  canvas.style.width=num+'px'
-      //   // // canvas.style.height=num+'px'
-      //   //   let filename = `${new Date().getTime()}.png`;
-      //   //   let imageUrl = canvas.toDataURL("image/png");
-      //   //   let a = document.createElement("a");
-      //   //   a.style.display = "none";
-      //   //   a.download = filename;
-      //   //   a.href = imageUrl;
-      //   //   document.body.appendChild(a);
-      //   //   a.click();
-      // });
-console.log('document.getElementsByClassName',document.getElementsByClassName('codeModal'),Number(props.index))
-          let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
-          let filename = `${new Date().getTime()}.png`;
-          let imageUrl = canvas.toDataURL("image/png");
-          let a = document.createElement("a");
-          a.style.display = "none";
-          a.download = filename;
-          a.href = imageUrl;
-          document.body.appendChild(a);
-          a.click();
+      var input = document.createElement("input"); // 创建input对象
+      input.value = state.codeInfo.url ? state.codeInfo.url : ""; // 设置复制内容
+      document.body.appendChild(input); // 添加临时实例
+      input.select(); // 选择实例内容
+      document.execCommand("Copy"); // 执行复制
+      document.body.removeChild(input); // 删除临时实例
+      message.success("复制成功！");
     };
     const closeCodeModal = () => {
       ctx.emit("update:codevisible", false);
@@ -166,12 +160,20 @@ console.log('document.getElementsByClassName',document.getElementsByClassName('c
         url: "",
       };
       state.codeInfo = Object.assign(obj, props.codeInfo);
-      console.log("codeInfo22222", state.codeInfo,props.index);
+      console.log("codeInfo22222", state.codeInfo, props.index, props.type);
+
+      if (props.type === "签到二维码") {
+        state.showUrl = false;
+        console.log(" state.showUrl", state.showUrl);
+      } else if (props.type === "课程二维码") {
+        state.showUrl = true;
+      }
     });
     return {
       ...toRefs(state),
       downloadQr,
       closeCodeModal,
+      copyUrl,
     };
   },
 };
@@ -229,8 +231,8 @@ console.log('document.getElementsByClassName',document.getElementsByClassName('c
             }
             .qrm_body {
               width: 100%;
-              margin-top: 22px;
-              margin-bottom: 32px;
+              padding-top: 22px;
+              padding-bottom: 32px;
               display: flex;
               flex-direction: column;
               align-items: center;
@@ -242,6 +244,51 @@ console.log('document.getElementsByClassName',document.getElementsByClassName('c
                 margin-bottom: 20px;
               }
             }
+            .codeUrl {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-bottom: 24px;
+              .codeUrlLink {
+                width: 72px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 14px;
+                font-weight: 400;
+                color: #c7cbd2;
+                line-height: 20px;
+                border: 1px solid #c7cbd2;
+                border-right: 0px solid #c7cbd2;
+              }
+              .codeUrlInp {
+                width: 305px;
+                height: 40px;
+                border: 1px solid #c7cbd2;
+              }
+              .ant-input-disabled {
+                background-color: rgba(0, 0, 0, 0) !important;
+              }
+              .ant-input[disabled] {
+                background-color: rgba(0, 0, 0, 0) !important;
+              }
+              .codeUrlCopy {
+                width: 96px;
+                height: 40px;
+                background-color: #388be1;
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 14px;
+                font-weight: 400;
+                color: #ffffff;
+                line-height: 20px;
+                cursor: pointer;
+                margin-left: 8px;
+              }
+            }
             .qrm_footer {
               display: flex;
               align-items: center;
diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue
index e52e83a2..5ca07e8a 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -121,169 +121,7 @@
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="2" tab="添加组织" force-render>
-                <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
-                >
-                  <div class="tab2">
-                    <div class="nameinp">
-                      <div class="namee">组织：</div>
-                      <a-input
-                        v-model:value="com"
-                        style="width: 230px; height: 40px; border-radius: 8px"
-                        placeholder="请输入组织"
-                      />
-                    </div>
-                    <div class="btns">
-                      <div class="btn1" @click="searchOrg">
-                        <div class="img1">
-                          <img
-                            src="../../assets/images/courseManage/search0.png"
-                          />
-                        </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="t1">
-                      <div class="organize">姓名：</div>
-                      <a-input
-                        v-model:value="nameadd"
-                        style="width: 200px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
-                      />
-                    </div> -->
-                  </div>
-                  <div class="boeTree">
-                    <div class="boeTreeTitle">BOE组织树</div>
-
-                    <a-tree
-                      class="treeMain treeMain2"
-                      :style="{ height: screenHeight - 430 + 'px' }"
-                      dropdownClassName="changetreedropdownboe"
-                      defaultExpandAll
-                      :dropdown-style="{
-                        maxHeight: '600px',
-                      }"
-                      placeholder="BOE组织树"
-                      allow-clear
-                      tree-default-expand-all
-                      :tree-data="treeData"
-                      @select="departmentSelect1"
-                      multiple
-                      v-model:selectedKeys="selectedKeys1"
-                    >
-                      <template #suffixIcon></template>
-                    </a-tree>
-                    <div
-                      class="boeTreeTitle"
-                      style="margin-top: 8px; cursor: pointer"
-                      @click="addOrgModal"
-                    >
-                      确认添加
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
-              <a-tab-pane key="3" tab="受众关联">
-                <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
-                >
-                  <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: 260px; 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>
-                      <div class="btn2">
-                        <div class="img2">
-                          <img
-                            src="../../assets/images/courseManage/reset1.png"
-                          />
-                        </div>
-                        <div class="wz">重置</div>
-                      </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="tableBox tabb" style="margin-top: 16px">
-                    <a-table
-                      style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns2"
-                      :data-source="tabledata2"
-                      :loading="tableDataTotal === -1 ? true : false"
-                      expandRowByClick="true"
-                      :scroll="{ x: 500 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :row-selection="{
-                        columnWidth: 30,
-                        selectedRowKeys: selectedRowKeys2,
-                        onChange: onSelectChange2,
-                      }"
-                    />
-                    <div class="pa" style="margin-top: 20px">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize2"
-                        :current="currentPage2"
-                        :total="tableDataTotal2"
-                        class="pagination"
-                        v-if="tabledata2 > 10"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
+            
             </a-tabs>
           </div>
         </div>
@@ -356,134 +194,7 @@
               </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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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">
@@ -492,44 +203,15 @@
       </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";
-import { toDate } from "../../api/method";
+// import { message } from "ant-design-vue";
+// import { toDate } from "../../api/method";
 export default {
   name: "OwnPower",
   props: {
@@ -885,136 +567,7 @@ export default {
         },
       ],
 
-      //受众关联table数据
-      tabledata2: [
-        {
-          key: 1,
-          name: "学习受众",
-          time: "1668410969",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 2,
-          name: "案例受众",
-          time: "1668324569",
-          number: "10",
-          type: "普通受众",
-        },
-        {
-          key: 3,
-          name: "学习受众",
-          time: "1668238169",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 4,
-          name: "显示受众",
-          time: "1668133769",
-          number: "30",
-          type: "普通受众2",
-        },
-        {
-          key: 5,
-          name: "惯例受众",
-          time: "1668047369",
-          number: "50",
-          type: "普通受众",
-        },
-        {
-          key: 6,
-          name: "管理受众",
-          time: "1667960969",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 7,
-          name: "学习小组受众",
-          time: "1667874569",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 8,
-          name: "学习受众",
-          time: "1667701769",
-          number: "10",
-          type: "普通受众",
-        },
-        {
-          key: 9,
-          name: "案例受众",
-          time: "1667442569",
-          number: "5",
-          type: "普通受众",
-        },
-        {
-          key: 10,
-          name: "项目受众",
-          time: "1667262569",
-          number: "25",
-          type: "普通受众",
-        },
-      ],
-      tablecolumns2: [
-        {
-          title: "受众名称",
-          dataIndex: "name",
-          key: "name",
-          width: 30,
-          align: "left",
-          className: "h",
-        },
-        {
-          title: "创建时间",
-          dataIndex: "time",
-          key: "time",
-          width: 35,
-          align: "center",
-          className: "h",
-          sorter: {
-            compare: (a, b) => a.time - b.time,
-            multiple: 3,
-          },
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="racona">
-                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "人数",
-          dataIndex: "number",
-          key: "number",
-          width: 30,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "类型",
-          dataIndex: "type",
-          key: "type",
-          width: 40,
-          align: "center",
-          className: "h",
-        },
-      ],
-      organizeList1: [
-        {
-          value: "产品受众群体",
-          label: "产品受众群体",
-        },
-        {
-          value: "人力资源hrbp",
-          label: "人力资源hrbp",
-        },
-      ],
+     
       //快速选人-------------------------------------
       valueSelectboe: null, //快速选人的选择组织
       choosepeople: [], //总的数组
@@ -1023,23 +576,7 @@ export default {
       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";
@@ -1153,217 +690,7 @@ export default {
 
     // 结束 快速选人------------------------------------------------------------------
 
-    // 开始 添加组织------------------------------------------------------------------
-    //选中部门
-    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("ownpower").querySelector("#selecteds1"),
-        function (ele) {
-          console.log("ele", ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden1) {
-            state.showMore1 = true;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore1 = false;
-            state.showHidden1 = false;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.height = "160px";
-          }
-        }
-      );
-    };
-    const morePeopleShow1 = () => {
-      state.showMore1 = false;
-      state.showHidden1 = true;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.overflow = "";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.height = "";
-    };
-    const morePeopleHidden1 = () => {
-      state.showMore1 = true;
-      state.showHidden1 = false;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.overflow = "hidden";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.height = "160px";
-    };
-    //搜索组织
-    const searchOrg = () => {
-      let treeTitle = document
-        .getElementById("ownpower")
-        .querySelector(".treeMain2")
-        .querySelectorAll(".ant-tree-title");
-      if (state.com) {
-        for (let i = 0; i < treeTitle.length; i++) {
-          if (state.com === treeTitle[i].innerHTML) {
-            document
-              .getElementById("ownpower")
-              .querySelector(".treeMain2")
-              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
-            return;
-          } else if (i == treeTitle.length - 1) {
-            message.destroy();
-            message.warning("未找到该部门");
-          }
-        }
-      } else {
-        message.destroy();
-        message.warning("请输入组织名称");
-      }
-    };
-    // 结束 添加组织------------------------------------------------------------------
-
-    // 开始 受众关联------------------------------------------------------------------
-
-    //受众关联 选中的数组
-    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("ownpower").querySelector("#selecteds2"),
-        function (ele) {
-          console.log("ele", ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden2) {
-            state.showMore2 = true;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore2 = false;
-            state.showHidden2 = false;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.height = "160px";
-          }
-        }
-      );
-    };
-    const morePeopleShow2 = () => {
-      state.showMore2 = false;
-      state.showHidden2 = true;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.overflow = "";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.height = "";
-    };
-    const morePeopleHidden2 = () => {
-      state.showMore2 = true;
-      state.showHidden2 = false;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.overflow = "hidden";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.height = "160px";
-    };
-
-    // 结束 受众关联------------------------------------------------------------------
+  
 
     //全部清除
     const deleteAll = () => {
@@ -1374,30 +701,13 @@ export default {
       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,
-      onSelectChange2,
       // change,
       departmentSelect,
       deleteChoosePeople,
@@ -1405,23 +715,10 @@ export default {
       morePeopleShow,
       morePeopleHidden,
 
-      departmentSelect1,
-      addOrgModal,
-      addOrg,
-      closeOrgModal,
-      selectedsHeight1,
-      morePeopleShow1,
-      morePeopleHidden1,
-      deleteChoosePeople1,
-
-      selectedsHeight2,
-      morePeopleShow2,
-      morePeopleHidden2,
-      deleteChoosePeople2,
+    
 
       deleteAll,
 
-      searchOrg,
     };
   },
 };
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 6ca6b5d4..0221c0fe 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -38,13 +38,13 @@
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
-          <div class="btn btn1">
+          <div class="btn btn1" @click="searchLearnPath">
             <div class="search"></div>
-            <div class="btnText" @click="searchLearnPath">搜索</div>
+            <div class="btnText" >搜索</div>
           </div>
-          <div class="btnn btn2">
+          <div class="btnn btn2" @click="resetLearnPath">
             <div class="search"></div>
-            <div class="btnText" @click="resetLearnPath">重置</div>
+            <div class="btnText" >重置</div>
           </div>
         </div>
       </div>
@@ -1349,7 +1349,7 @@ export default {
         .getLearnPath(obj)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("获取路径列表数据", res.data.data);
+            console.log("获取路径列表数据", res.data.data);
             let arr = res.data.data.rows;
             if (
               arr.length === 0 &&
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index e21cafdd..9d48e5f9 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -1,44 +1,73 @@
 <!---- 创建项目页面 --->
 <template>
-	<div class="projectAdd">
-		<div class="header">
-			<span class="title">创建/编辑单层项目</span>
-			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
-				<span class="return"></span><span class="returntext">返回</span>
-			</div>
-		</div>
-		<div class="content">
-			<div class="main">
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目名称</div>
-					</div>
-					<div class="in">
-						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">分类</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-							@change="classificationChange" allowClear showSearch>
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">封面图</div>
-					</div>
-					<div class="box" style="
+  <div class="projectAdd">
+    <div class="header">
+      <span class="title">创建/编辑单层项目</span>
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
+      >
+        <span class="return"></span><span class="returntext">返回</span>
+      </div>
+    </div>
+    <div class="content">
+      <div class="main">
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目名称</div>
+          </div>
+          <div class="in">
+            <a-input
+              v-model:value="projectName"
+              placeholder="请输入项目名称"
+              show-count
+              :maxlength="30"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">分类</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect"
+              placeholder="四个养成"
+              style="width: 100%"
+              :options="classifyList"
+              @change="classificationChange"
+              allowClear
+              showSearch
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">封面图</div>
+          </div>
+          <div
+            class="box"
+            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -46,128 +75,205 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            ">
-						<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 style="
+            "
+          >
+            <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
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                " 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="box1"></div>
-								<div class="box2"></div>
-								<!-- <div class="ant-upload-text"></div> -->
-							</div>
-						</a-upload>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目时间</div>
-					</div>
+                "
+                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="box1"></div>
+                <div class="box2"></div>
+                <!-- <div class="ant-upload-text"></div> -->
+              </div>
+            </a-upload>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目时间</div>
+          </div>
 
-					<div class="in">
-						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
-							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目经理</div>
-					</div>
-					<div class="in">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-							@change="classificationChange1" allowClear showSearch>
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">资源归属</div>
-					</div>
+          <div class="in">
+            <a-range-picker
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="rangevalue"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              @change="onRangeChange"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目经理</div>
+          </div>
+          <div class="in">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              :value="classifySelect1"
+              mode="multiple"
+              placeholder="请选择项目经理"
+              style="width: 100%"
+              :options="classifyList1"
+              @change="classificationChange1"
+              allowClear
+              showSearch
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">资源归属</div>
+          </div>
 
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
-							@change="classificationChange2" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname" style="margin-top: 13px">项目说明</div>
-					</div>
-					<div class="in">
-						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname">同步学习记录</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              placeholder="自动带出 可修改"
+              :options="classifyList2"
+              @change="classificationChange2"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">项目说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-radio @click="changeChecked" v-model:checked="checked"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目级别</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
-							placeholder="集团级/组织级/现地级/部门级" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">培训体系</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
-							placeholder="集团级/组织级/现地级/部门级" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">是否BOEU实施</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect3"
+              :options="classifyList3"
+              @change="classificationChange3"
+              placeholder="集团级/组织级/现地级/部门级"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训体系</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect4"
+              :options="classifyList4"
+              @change="classificationChange4"
+              placeholder="集团级/组织级/现地级/部门级"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio @click="changeChecked1" v-model:checked="checked1"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">BOEU实施</span></a-radio>
-					</div>
-				</div>
-				<!-- <div class="name name2">
+                "
+                >BOEU实施</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <!-- <div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">附件</div>
@@ -186,904 +292,1050 @@
 						</div>
 					</div>
 				</div> -->
-			</div>
-			<div class="template">
-				<div class="name">
-					<div class="inname" style="width: 50px">模版</div>
-					<div class="in select" style="margin-left: 2px">
-						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-						<a-select v-else :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="footer">
-			<div class="btn">
-				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-				<a-button @click="backPage" class="btn2">取消</a-button>
-			</div>
-		</div>
-	</div>
+      </div>
+      <div class="template">
+        <div class="name">
+          <div class="inname" style="width: 50px">模版</div>
+          <div class="in select" style="margin-left: 2px">
+            <a-select
+              v-if="isEdit"
+              disabled="true"
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+            <a-select
+              v-else
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+            >
+            </a-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <div class="btn">
+        <a-button v-on:click="createProject" type="primary" class="btn1"
+          >确定</a-button
+        >
+        <a-button @click="backPage" class="btn2">取消</a-button>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import * as api from "../../api/index";
-import { storage } from '../../api/storage';
-import { toDate } from '../../api/method'
+import { storage } from "../../api/storage";
+import { toDate } from "../../api/method";
 
 export default {
-	name: "projectAdd",
-	setup() {
-		// 编辑页面跳转过来时候，自动填充表格
-		const routers = useRoute();
-		const isEdit = ref(false);
-		let peojectID = "";
+  name: "projectAdd",
+  setup() {
+    // 编辑页面跳转过来时候，自动填充表格
+    const routers = useRoute();
+    const isEdit = ref(false);
+    let peojectID = "";
 
-		if (routers.query.projectId) {
-			storage.set("projectAddId", routers.query.projectId);
-			isEdit.value = true;
-			peojectID = routers.query.projectId;
-			// 需要编辑
-			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
-				if (res.status == 200 && res.data.code == 200) {
-					let info = res.data.data.projectInfo;
-					console.log(info)
-					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-					projectName.value = info.name;
-					state.classifySelect = classifyList.value[1]; // info.category
-					imageUrl.value = info.picUrl;
+    if (routers.query.projectId) {
+      storage.set("projectAddId", routers.query.projectId);
+      isEdit.value = true;
+      peojectID = routers.query.projectId;
+      // 需要编辑
+      api
+        .getProjectDetail({ projectId: routers.query.projectId })
+        .then((res) => {
+          if (res.status == 200 && res.data.code == 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
 
-					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
-					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
-					state.rangevalue = [
-						dayjs(start, 'YYYY/MM/DD'),
-						dayjs(end, 'YYYY/MM/DD'),
-					];
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
 
-					let manageName = info.manager.split(",");
-					let manageValue = info.managerId.split(",");
-					let optionsManage = []
-					for (let i = 0; i < manageName.length; i++) {
-						let obj = {
-							label: manageName[i],
-							value: manageValue[i]
-						}
-						optionsManage.push(obj)
-					}
-					console.log(optionsManage)
-					state.classifySelect1 = optionsManage;
-					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
-					remark.value = info.remark;
-					state.checked = info.boeFlag ? info.boeFlag : false;
-					state.classifySelect3 = classifyList3.value[info.level];
-					state.classifySelect4 = classifyList4.value[info.systemId - 1];
-					state.checked1 = info.boeFlag ? info.boeFlag : false;
-					// fileList1.value = info.attach.split(",");
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
 
-					projectType = 1;
-					picUrl  = info.picUrl; 
-					beginTime = Number(info.beginTime/1000);
-					endTime   = Number(info.endTime/1000);
-					manager   = info.manager;
-					managerId  = info.managerId;
-					sourceBelongIdC  = Number(info.sourceBelongId);
-					courseSyncFlag  = info.courseSyncFlag; 
-					levels  = info.level;
-					systemid = info.systemId;
-					boeFlag = info.boeFlag;
-				}
-			}).catch(err => { console.log(err) })
-		} else {
-			if (storage.get("projectAddId")) {
-				isEdit.value = true;
-				peojectID = storage.get("projectAddId");
-				// 需要编辑
-				api.getProjectDetail({ projectId: storage.get("projectAddId") }).then(res => {
-					if (res.status == 200 && res.data.code == 200) {
-						let info = res.data.data.projectInfo;
-						console.log("我是从本地存储获取的id", info)
-						projectName.value = info.name;
-					state.classifySelect = classifyList.value[1]; // info.category
-					imageUrl.value = info.picUrl;
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    } else {
+      if (storage.get("projectAddId")) {
+        isEdit.value = true;
+        peojectID = storage.get("projectAddId");
+        // 需要编辑
+        api
+          .getProjectDetail({ projectId: storage.get("projectAddId") })
+          .then((res) => {
+            if (res.status == 200 && res.data.code == 200) {
+              let info = res.data.data.projectInfo;
+              console.log("我是从本地存储获取的id", info);
+              projectName.value = info.name;
+              state.classifySelect = classifyList.value[1]; // info.category
+              imageUrl.value = info.picUrl;
 
-					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
-					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
-					state.rangevalue = [
-						dayjs(start, 'YYYY/MM/DD'),
-						dayjs(end, 'YYYY/MM/DD'),
-					];
+              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+              state.rangevalue = [
+                dayjs(start, "YYYY/MM/DD"),
+                dayjs(end, "YYYY/MM/DD"),
+              ];
 
-					let manageName = info.manager.split(",");
-					let manageValue = info.managerId.split(",");
-					let optionsManage = []
-					for (let i = 0; i < manageName.length; i++) {
-						let obj = {
-							label: manageName[i],
-							value: manageValue[i]
-						}
-						optionsManage.push(obj)
-					}
-					console.log(optionsManage)
-					state.classifySelect1 = optionsManage;
-					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
-					remark.value = info.remark;
-					state.checked = info.boeFlag ? info.boeFlag : false;
-					state.classifySelect3 = classifyList3.value[info.level];
-					state.classifySelect4 = classifyList4.value[info.systemId - 1];
-					state.checked1 = info.boeFlag ? info.boeFlag : false;
+              let manageName = info.manager.split(",");
+              let manageValue = info.managerId.split(",");
+              let optionsManage = [];
+              for (let i = 0; i < manageName.length; i++) {
+                let obj = {
+                  label: manageName[i],
+                  value: manageValue[i],
+                };
+                optionsManage.push(obj);
+              }
+              console.log(optionsManage);
+              state.classifySelect1 = optionsManage;
+              state.classifySelect2 =
+                classifyList2.value[info.sourceBelongId - 1];
+              remark.value = info.remark;
+              state.checked = info.boeFlag ? info.boeFlag : false;
+              state.classifySelect3 = classifyList3.value[info.level];
+              state.classifySelect4 = classifyList4.value[info.systemId - 1];
+              state.checked1 = info.boeFlag ? info.boeFlag : false;
 
-					projectType = 1;
-					picUrl  = info.picUrl; 
-					beginTime = Number(info.beginTime/1000);
-					endTime   = Number(info.endTime/1000);
-					manager   = info.manager;
-					managerId  = info.managerId;
-					sourceBelongIdC  = Number(info.sourceBelongId);
-					courseSyncFlag  = info.courseSyncFlag; 
-					levels  = info.level;
-					systemid = info.systemId;
-					boeFlag = info.boeFlag;
-					}
-				}).catch(err => { console.log(err) })
-			}
-		}
+              projectType = 1;
+              picUrl = info.picUrl;
+              beginTime = Number(info.beginTime / 1000);
+              endTime = Number(info.endTime / 1000);
+              manager = info.manager;
+              managerId = info.managerId;
+              sourceBelongIdC = Number(info.sourceBelongId);
+              courseSyncFlag = info.courseSyncFlag;
+              levels = info.level;
+              systemid = info.systemId;
+              boeFlag = info.boeFlag;
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    }
 
-		const backPage = () => {
-			storage.remove("projectAddId");
-			setTimeout(() => {
-				router.push({
-					path: "/projectmanage"
-				});
-			}, 400);
-		}
+    const backPage = () => {
+      storage.remove("projectAddId");
+      setTimeout(() => {
+        router.push({
+          path: "/projectmanage",
+        });
+      }, 400);
+    };
 
-		const router = useRouter();
-		const state = reactive({
-			classifySelect: null,
-			classifySelectId: null,
-			checked: false,
-			checked1: false,
-			valueE: null,
-			valueE1: null,
-			valueE2: null,
-			classifySelect1: [],
-			classifySelect2: [],
-			classifySelect3: [],
-			classifySelect4: [],
-			rangevalue: []
-		});
+    const router = useRouter();
+    const state = reactive({
+      classifySelect: null,
+      classifySelectId: null,
+      checked: false,
+      checked1: false,
+      valueE: null,
+      valueE1: null,
+      valueE2: null,
+      classifySelect1: [],
+      classifySelect2: [],
+      classifySelect3: [],
+      classifySelect4: [],
+      rangevalue: [],
 
-		const projectName = ref("");
+      currentPage: 1, //当前页
+      tableDataTotal: -1, //模版列表总数
+      pageSize: 10, //每页10条数据
+      totalPages: 0, //总页数
+    });
 
-		const classifyList = ref([
-			{ value: 1, label: "管理者" },
-			{ value: 2, label: "领军者" },
-			{ value: 3, label: "产业人" },
-		]);
+    const projectName = ref("");
 
-		let projectType = "";
+    const classifyList = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
 
-		const classificationChange = (value) => {
-			console.log(`selected ${value}`);
-			projectType = value;
-		};
+    let projectType = "";
 
-		function getBase64(img, callback) {
-			const reader = new FileReader();
-			reader.addEventListener("load", () => callback(reader.result));
-			reader.readAsDataURL(img);
-		}
+    const classificationChange = (value) => {
+      console.log(`selected ${value}`);
+      projectType = value;
+    };
 
-		const fileList = ref([]);
-		const fileList1 = ref([]);
-		const loading = ref(false);
-		const imageUrl = ref("");
-		let picUrl = "";
+    function getBase64(img, callback) {
+      const reader = new FileReader();
+      reader.addEventListener("load", () => callback(reader.result));
+      reader.readAsDataURL(img);
+    }
 
-		const handleChange = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log("上传图片返回的信息 %o", info);
-				picUrl = info.file.response.data;
-				// Get this url from response in real world.
-				getBase64(info.file.originFileObj, (base64Url) => {
-					imageUrl.value = base64Url;
-					loading.value = false;
-				});
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+    const fileList = ref([]);
+    const fileList1 = ref([]);
+    const loading = ref(false);
+    const imageUrl = ref("");
+    let picUrl = "";
 
-		let uplodaFileCount = false;
+    const handleChange = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log("上传图片返回的信息 %o", info);
+        picUrl = info.file.response.data;
+        // Get this url from response in real world.
+        getBase64(info.file.originFileObj, (base64Url) => {
+          imageUrl.value = base64Url;
+          loading.value = false;
+        });
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		let attach = "";
-		let attachData = "";
-		const handleChange1 = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log(
-					"上传附件返回的信息 %o",
-					info,
-					info.fileList.length,
-					uplodaFileCount
-				);
+    let uplodaFileCount = false;
 
-				let attachStr = "";
-				attachData = info.fileList;
-				for (let i = 0; i < attachData.length; i++) {
-					if (attachData.length - 1 == i) {
-						attachStr += attachData[i].response.data;
-					} else {
-						attachStr += attachData[i].response.data + ",";
-					}
-				}
-				console.log(attachStr);
-				attach = attachStr;
+    let attach = "";
+    let attachData = "";
+    const handleChange1 = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log(
+          "上传附件返回的信息 %o",
+          info,
+          info.fileList.length,
+          uplodaFileCount
+        );
 
-				if (info.fileList.length > 5) {
-					uplodaFileCount = true;
-				} else {
-					uplodaFileCount = false;
-				}
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+        let attachStr = "";
+        attachData = info.fileList;
+        for (let i = 0; i < attachData.length; i++) {
+          if (attachData.length - 1 == i) {
+            attachStr += attachData[i].response.data;
+          } else {
+            attachStr += attachData[i].response.data + ",";
+          }
+        }
+        console.log(attachStr);
+        attach = attachStr;
 
-		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;
-		};
+        if (info.fileList.length > 5) {
+          uplodaFileCount = true;
+        } else {
+          uplodaFileCount = false;
+        }
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		const beforeUpload1 = () => {
-			return new Promise((resovle, reject) => {
-				if (uplodaFileCount) {
-					message.info("上传文件数量已达最大数量");
-					return reject(false);
-				}
-				return resovle(true);
-			});
-		};
+    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;
+    };
 
-		let beginTime = "";
-		let endTime = "";
-		const dateFormatList = ['YYYY/MM/DD'];
+    const beforeUpload1 = () => {
+      return new Promise((resovle, reject) => {
+        if (uplodaFileCount) {
+          message.info("上传文件数量已达最大数量");
+          return reject(false);
+        }
+        return resovle(true);
+      });
+    };
 
-		const onRangeChange = (value, dateString) => {
-			console.log("Selected Time: ", value);
-			// 项目时间选择函数
-			console.log("Formatted Selected Time: ", dateString);
-			console.log(
-				"Formatted Selected TimeStamp",
-				new Date(dateString[0]).getTime()
-			);
-			beginTime = new Date(dateString[0]).getTime() / 1000;
-			endTime = new Date(dateString[1]).getTime() / 1000;
-		};
+    let beginTime = "";
+    let endTime = "";
+    const dateFormatList = ["YYYY/MM/DD"];
 
-		// 项目经理 后续接口调用
-		const classifyList1 = ref([
-			{ value: 1, label: "李俊国" },
-			{ value: 2, label: "将小米" },
-			{ value: 3, label: "刘孟君" },
-		]);
+    const onRangeChange = (value, dateString) => {
+      console.log("Selected Time: ", value);
+      // 项目时间选择函数
+      console.log("Formatted Selected Time: ", dateString);
+      console.log(
+        "Formatted Selected TimeStamp",
+        new Date(dateString[0]).getTime()
+      );
+      beginTime = new Date(dateString[0]).getTime() / 1000;
+      endTime = new Date(dateString[1]).getTime() / 1000;
+    };
 
-		let manager = "";
-		let managerId = "";
-		const classificationChange1 = (key, options) => {
-			console.log(`selected ${key}`, options);
-			let mstr = "";
-			let midstr = "";
-			for (let i = 0; i < key.length; i++) {
-				if (key.length - 1 !== i) {
-					midstr += key[i] + ",";
-					mstr += classifyList1.value[i].label + ",";
-				} else {
-					midstr += key[i];
-					mstr += classifyList1.value[i].label;
-				}
-			}
-			console.log(mstr, midstr);
-			state.classifySelect1 = options;
-			let newoptions = [];
-			for (let i = 0; i < state.classifySelect1.length; i++) {
-				if (state.classifySelect1[i].value) {
-					newoptions.push(state.classifySelect1[i])
-				}
-			}
-			state.classifySelect1 = newoptions;
-			manager = mstr;
-			managerId = midstr;
-		};
+    // 项目经理 后续接口调用
+    const classifyList1 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
 
-		// 资源归属 sourceBelongId 后续给接口
-		const classifyList2 = ref([
-			{ value: 1, label: "项目一" },
-			{ value: 2, label: "项目二" },
-			{ value: 3, label: "项目三" },
-		]);
+    let manager = "";
+    let managerId = "";
+    const classificationChange1 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      state.classifySelect1 = options;
+      let newoptions = [];
+      for (let i = 0; i < state.classifySelect1.length; i++) {
+        if (state.classifySelect1[i].value) {
+          newoptions.push(state.classifySelect1[i]);
+        }
+      }
+      state.classifySelect1 = newoptions;
+      manager = mstr;
+      managerId = midstr;
+    };
 
-		let sourceBelongIdC = '';
-		const classificationChange2 = (key) => {
-			console.log(`selected ${key}`, classifyList2);
-			sourceBelongIdC = key;
-		};
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList2 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
 
-		// 项目级别
-		const classifyList3 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let sourceBelongIdC = "";
+    const classificationChange2 = (key) => {
+      console.log(`selected ${key}`, classifyList2);
+      sourceBelongIdC = key;
+    };
 
-		let levels = "";
-		const classificationChange3 = (key) => {
-			console.log(`selected ${key}`, classifyList3);
-			levels = key;
-		};
+    // 项目级别
+    const classifyList3 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 培训体系
-		const classifyList4 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let levels = "";
+    const classificationChange3 = (key) => {
+      console.log(`selected ${key}`, classifyList3);
+      levels = key;
+    };
 
-		let systemid = "";
-		const classificationChange4 = (key) => {
-			console.log(`selected ${key}`, classifyList4);
-			systemid = key;
-		};
+    // 培训体系
+    const classifyList4 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 模版
-		const classifyList5 = ref([
-			{ value: 1, label: "模版一" },
-			{ value: 2, label: "模版二" },
-			{ value: 3, label: "模版三" },
-			{ value: 4, label: "模版四" },
-		]);
-		const classificationChange5 = (key) => {
-			console.log(`selected ${key}`, classifyList5);
-		};
+    let systemid = "";
+    const classificationChange4 = (key) => {
+      console.log(`selected ${key}`, classifyList4);
+      systemid = key;
+    };
 
-		// 项目说明
-		const remark = ref("");
+    // 模版
+    const classifyList5 = ref([
+      // { value: 1, label: "模版一" },
+      // { value: 2, label: "模版二" },
+      // { value: 3, label: "模版三" },
+      // { value: 4, label: "模版四" },
+    ]);
+    const classificationChange5 = (key) => {
+      console.log(`selected ${key}`, classifyList5.value);
+      //获取模版信息
+      let obj = {
+        projectId: Number(key),
+      };
+      api
+        .getProjectDetail(obj)
+        .then((res) => {
+          console.log("获取项目详情", res);
+          if (res.status === 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
 
-		let courseSyncFlag = 0;
-		const changeChecked = () => {
-			console.log(state.checked);
-			state.checked ? (state.checked = false) : (state.checked = true);
-			courseSyncFlag = state.checked ? 1 : 0;
-		};
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
 
-		let boeFlag = 0;
-		const changeChecked1 = () => {
-			console.log(state.checked1);
-			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-			boeFlag = state.checked1 ? 1 : 0;
-		};
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
 
-		const removeFile = (file) => {
-			const index = fileList1.value.indexOf(file);
-			const newFileList = fileList1.value.slice();
-			newFileList.splice(index, 1);
-			fileList1.value = newFileList;
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+          }
+        })
+        .catch((err) => {
+          console.log("获取详情失败", err);
+        });
+    };
+    //获取模版列表
+    const getTemplate = () => {
+      let obj = {
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        // projectId:id?id:''
+      };
+      api
+        .getProjectList(obj)
+        .then((res) => {
+          console.log("获取模版列表", res);
+          state.totalPages = Number(res.data.data.pages);
+          if (res.status === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList5.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.projectId,
+                label: value.name,
+              };
+              array.push(obj);
+            });
+            classifyList5.value = array;
+          }
+        })
+        .catch((err) => {
+          console.log("获取模版列表失败", err);
+        });
+    };
+    getTemplate();
+    //模版滚动加载信息
+    const templateScroll = (e) => {
+      // console.log("滚动", e, b);
+      const { target } = e;
+      const scrllHeight = target.scrollHeight - target.scrollTop;
+      const clientHeight = target.clientHeight;
+      // console.log("scrllHeight", scrllHeight, clientHeight);
+      if (scrllHeight === 0 && clientHeight === 0) {
+        state.currentPage = 1;
+      } else if (scrllHeight - clientHeight == 0) {
+        // 下拉到底部时
+        if (state.currentPage < state.totalPages) {
+          // 如果滑到底部，则加载下一页
+          state.currentPage++;
+          getTemplate();
+        }
+      }
+    };
 
-			let attachStr = "";
-			if (newFileList.length == 0) {
-				attachStr = "";
-			}
-			for (let i = 0; i < fileList1["value"].length; i++) {
-				console.log(fileList1["value"][i].response.data);
-				if (fileList1["value"].length - 1 == i) {
-					attachStr += fileList1["value"][i].response.data;
-				} else {
-					attachStr += fileList1["value"][i].response.data + ",";
-				}
-			}
-			attach = attachStr;
-		};
+    // 项目说明
+    const remark = ref("");
 
-		const errorMsgs = {
-			name: "请输入项目名称",
-			category: "请选择项目分类",
-			picUrl: "请上传项目封面图",
-			beginTime: "请选择项目开始时间",
-			endTime: "请选择项目结束时间",
-			manager: "请选择项目经理",
-			managerId: "请选择项目经理",
-			sourceBelongId: "请选择资源归属",
-			level: "请填写项目级别",
-			systemId: "请填写项目培训体系",
-			boeFlag: "请选择是否BOE实施"
-		};
-		
-		const createProject = () => {
-			console.log('我是否要编辑项目', isEdit.value)
-			if (isEdit.value) {
-				console.log('我要编辑项目', peojectID)
-				let obj = {
-					projectId: Number(peojectID),
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 0,
-					parentId: 0,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
+    let courseSyncFlag = 0;
+    const changeChecked = () => {
+      console.log(state.checked);
+      state.checked ? (state.checked = false) : (state.checked = true);
+      courseSyncFlag = state.checked ? 1 : 0;
+    };
 
-				console.log(obj);
+    let boeFlag = 0;
+    const changeChecked1 = () => {
+      console.log(state.checked1);
+      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+      boeFlag = state.checked1 ? 1 : 0;
+    };
 
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+    const removeFile = (file) => {
+      const index = fileList1.value.indexOf(file);
+      const newFileList = fileList1.value.slice();
+      newFileList.splice(index, 1);
+      fileList1.value = newFileList;
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("编辑成功");
-							setTimeout(() => {
-								router.push({
-									path: "/projectmanage"
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("编辑失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("编辑失败，请检查当前网络状态。");
-					});
+      let attachStr = "";
+      if (newFileList.length == 0) {
+        attachStr = "";
+      }
+      for (let i = 0; i < fileList1["value"].length; i++) {
+        console.log(fileList1["value"][i].response.data);
+        if (fileList1["value"].length - 1 == i) {
+          attachStr += fileList1["value"][i].response.data;
+        } else {
+          attachStr += fileList1["value"][i].response.data + ",";
+        }
+      }
+      attach = attachStr;
+    };
 
-			} else {
-				let obj = {
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 10,
-					parentId: 0,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
-				console.log("提交的数据格式 %o", obj);
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+    const errorMsgs = {
+      name: "请输入项目名称",
+      category: "请选择项目分类",
+      picUrl: "请上传项目封面图",
+      beginTime: "请选择项目开始时间",
+      endTime: "请选择项目结束时间",
+      manager: "请选择项目经理",
+      managerId: "请选择项目经理",
+      sourceBelongId: "请选择资源归属",
+      level: "请填写项目级别",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOE实施",
+    };
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("创建成功");
-							setTimeout(() => {
-								router.push({
-									path: "/taskpage",
-									query: { id: res.data.data.projectId },
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("创建失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("创建失败，请检查当前网络状态。");
-					});
-			}
-		};
+    const createProject = () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      if (isEdit.value) {
+        console.log("我要编辑项目", peojectID);
+        let obj = {
+          projectId: Number(peojectID),
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 0,
+          parentId: 0,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
 
-		return {
-			...toRefs(state),
-			projectName,
-			classifyList,
-			classificationChange,
-			classificationChange1,
-			classificationChange2,
-			classificationChange3,
-			classificationChange4,
-			classificationChange5,
-			fileList,
-			fileList1,
-			loading,
-			imageUrl,
-			handleChange,
-			handleChange1,
-			beforeUpload,
-			beforeUpload1,
-			onRangeChange,
-			classifyList1,
-			classifyList2,
-			classifyList3,
-			classifyList4,
-			classifyList5,
-			remark,
-			changeChecked,
-			changeChecked1,
-			uplodaFileCount,
-			createProject,
-			removeFile,
+        console.log(obj);
 
-			isEdit,
-			backPage,
-			dateFormatList,
-		};
-	},
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
+
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("编辑成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/projectmanage",
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("编辑失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("编辑失败，请检查当前网络状态。");
+          });
+      } else {
+        let obj = {
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 10,
+          parentId: 0,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
+        console.log("提交的数据格式 %o", obj);
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
+
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("创建成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/taskpage",
+                  query: { id: res.data.data.projectId },
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("创建失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("创建失败，请检查当前网络状态。");
+          });
+      }
+    };
+
+    return {
+      ...toRefs(state),
+      projectName,
+      classifyList,
+      classificationChange,
+      classificationChange1,
+      classificationChange2,
+      classificationChange3,
+      classificationChange4,
+      classificationChange5,
+      fileList,
+      fileList1,
+      loading,
+      imageUrl,
+      handleChange,
+      handleChange1,
+      beforeUpload,
+      beforeUpload1,
+      onRangeChange,
+      classifyList1,
+      classifyList2,
+      classifyList3,
+      classifyList4,
+      classifyList5,
+      remark,
+      changeChecked,
+      changeChecked1,
+      uplodaFileCount,
+      createProject,
+      removeFile,
+
+      isEdit,
+      backPage,
+      dateFormatList,
+
+      templateScroll,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .projectAdd {
-	width: 100%;
-	// height: inherit;
-	// flex: 1;
-	// flex-shrink: 0;
-	// overflow-y: auto;
+  width: 100%;
+  // height: inherit;
+  // flex: 1;
+  // flex-shrink: 0;
+  // overflow-y: auto;
 
-	.header {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
+  .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;
-		}
+    .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;
+    .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");
-			}
+      .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;
-			}
-		}
-	}
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
 
-	// 修改 antd upload 样式
-	.ant-upload {
-		border-width: 0px;
-	}
+  // 修改 antd upload 样式
+  .ant-upload {
+    border-width: 0px;
+  }
 
-	.content {
-		display: flex;
+  .content {
+    display: flex;
 
-		.main {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: left;
-			border-right: 1px solid rgba(153, 155, 163, 0.3);
+    .main {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: left;
+      border-right: 1px solid rgba(153, 155, 163, 0.3);
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
+      .name {
+        width: 78%;
+        // 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;
+        //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;
-					}
-				}
+          .nameimg {
+            width: 10px;
+            height: 10px;
+          }
+        }
 
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.box {
-					position: relative;
-					margin-left: 14px;
+        .box {
+          position: relative;
+          margin-left: 14px;
 
-					.box1 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						width: 50px;
-						margin-left: -25px;
-						margin-top: -5px;
-						border-top: 2px solid rgba(78, 166, 255, 1);
-					}
+          .box1 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            margin-left: -25px;
+            margin-top: -5px;
+            border-top: 2px solid rgba(78, 166, 255, 1);
+          }
 
-					.box2 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						height: 50px;
-						//margin-left: -5px;
-						margin-top: -25px;
-						border-left: 2px solid rgba(78, 166, 255, 1);
-					}
-				}
+          .box2 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 50px;
+            //margin-left: -5px;
+            margin-top: -25px;
+            border-left: 2px solid rgba(78, 166, 255, 1);
+          }
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+        }
 
-				.in {
-					margin-left: 14px;
-					flex: 1;
+        .in {
+          margin-left: 14px;
+          flex: 1;
 
-					// .ant-radio-wrapper {
-					// }
-					.ant-input-textarea-show-count {
-						position: relative;
-						height: 88px;
-					}
+          // .ant-radio-wrapper {
+          // }
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
 
-					.ant-input-textarea-show-count::after {
-						position: absolute;
-						right: 10px;
-						bottom: 0px;
-					}
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 0px;
+          }
 
-					.ant-input {
-						border-radius: 8px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 8px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-input-affix-wrapper {
-						padding: 0 11px;
-						border-radius: 8px;
-					}
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            // height: 40px;
+          }
+        }
 
-				.filebox {
-					margin-left: 14px;
-					flex: 1;
+        .filebox {
+          margin-left: 14px;
+          flex: 1;
 
-					.fileimg {
-						width: 15px;
-						height: 15px;
-						margin-right: 6px;
-					}
+          .fileimg {
+            width: 15px;
+            height: 15px;
+            margin-right: 6px;
+          }
 
-					.filetext {
-						font-size: 14px;
-						font-weight: 400;
-						color: #4ea6ff;
-						line-height: 36px;
-					}
+          .filetext {
+            font-size: 14px;
+            font-weight: 400;
+            color: #4ea6ff;
+            line-height: 36px;
+          }
 
-					.support {
-						font-size: 14px;
-						font-weight: 400;
-						color: #999ba3;
-						line-height: 36px;
-						margin-top: 8px;
-						word-break: break-all;
-					}
-				}
-			}
+          .support {
+            font-size: 14px;
+            font-weight: 400;
+            color: #999ba3;
+            line-height: 36px;
+            margin-top: 8px;
+            word-break: break-all;
+          }
+        }
+      }
 
-			.name2 {
-				display: flex;
-				align-items: flex-start;
+      .name2 {
+        display: flex;
+        align-items: flex-start;
 
-				.ant-input-textarea {
-					.ant-input {
-						height: 88px;
-					}
-				}
-			}
-		}
+        .ant-input-textarea {
+          .ant-input {
+            height: 88px;
+          }
+        }
+      }
+    }
 
-		.template {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: right;
+    .template {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: right;
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
-				height: 40px;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        height: 40px;
 
-				// border: 1px solid black;
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        // border: 1px solid black;
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-					width: 65px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+          width: 65px;
+        }
 
-				.in {
-					margin-left: 14px;
-					width: 81%;
+        .in {
+          margin-left: 14px;
+          width: 81%;
 
-					.ant-input {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
-			}
-		}
-	}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
+      }
+    }
+  }
 
-	.footer {
-		width: 100%;
-		margin-top: 31px;
-		margin-bottom: 14px;
-		padding-bottom: 20px;
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    padding-bottom: 20px;
 
-		.btn {
-			display: flex;
-			justify-content: center;
+    .btn {
+      display: flex;
+      justify-content: center;
 
-			.btn1 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				background: #409eff;
-				color: #ffffff;
-				margin-right: 14px;
-			}
+      .btn1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        background: #409eff;
+        color: #ffffff;
+        margin-right: 14px;
+      }
 
-			.btn2 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				border: 1px solid #409eff;
-				background: #ffffff;
-				color: #409eff;
-			}
-		}
+      .btn2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        border: 1px solid #409eff;
+        background: #ffffff;
+        color: #409eff;
+      }
+    }
 
-		.text {
-			color: rgba(153, 155, 163, 1);
-			font-size: 14px;
-			margin-left: 223px;
-		}
-	}
+    .text {
+      color: rgba(153, 155, 163, 1);
+      font-size: 14px;
+      margin-left: 223px;
+    }
+  }
 }
 </style>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 6a7c4608..cd27de75 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -419,23 +419,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        :style="{
-                          display:
-                            item.type == '6' ||
-                            item.type == '9' ||
-                            item.type == '2'
-                              ? 'flex'
-                              : 'none',
-                        }"
-                        @click="
-                          item.type == '2'
-                            ? showCopyModal(item.type)
-                            : item.type == '6'
-                            ? showzhibModal(item.type)
-                            : item.type == '9'
-                            ? showhuodModal(item.type)
-                            : null
-                        "
+                        @click="showCodeModal"
                       >
                         二维码
                       </div>
@@ -1373,6 +1357,7 @@
       </a-modal>
     </div>
     <!-- 删除弹窗 -->
+
     <!-- 面授管理二维码 -->
     <a-modal
       v-model:visible="copyModal"
@@ -1490,6 +1475,15 @@
     </div>
     <!-- 编辑项目弹窗 -->
     <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
+
+    <!-- 二维码弹窗 -->
+    <two-dimensional-code
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
+    />
+    <!-- 二维码弹窗 -->
   </div>
 </template>
 <script>
@@ -1529,6 +1523,7 @@ import { getTask } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
+import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
   name: "taskPage",
   components: {
@@ -1550,6 +1545,7 @@ export default {
     TaskImpStu,
     projSet,
     NoticeHis,
+    TwoDimensionalCode,
   },
   setup() {
     const state = reactive({
@@ -1664,6 +1660,9 @@ export default {
 
       huodModal: false, //活动二维码弹窗
       allDelete: false, //批量删除弹窗
+
+      codevisible: false, //二维码弹窗
+      codeInfo: null, //二维码信息
       pubproject: false,
       stugroup: false,
       canclestu: false,
@@ -2505,6 +2504,15 @@ export default {
     const showEditProj = () => {
       state.editHs = true;
     };
+    //显示二维码弹窗
+    const showCodeModal = () => {
+      state.codevisible = true;
+      state.codeInfo = {
+        title: "课程二维码",
+        name: "管理者进阶面授课程",
+        url: "https://www.baidu.com/https://www.baidu.com/https://www.baidu.com/https://www.baidu.com/https://www.baidu.com/",
+      };
+    };
 
     //学员管理列表操作
     const studentData = () => {
@@ -3199,6 +3207,7 @@ export default {
       closehuodModal,
       closezhibModal,
 
+      showCodeModal,
       tabsChange,
 
       getTaskList,
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 215b48f6..7b305020 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -91,10 +91,10 @@
   </div>
 
 <div @click="changeCodevisible">显示二维码弹窗</div>
-  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0"/>
+  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0" type="课程二维码"/>
 
   <div @click="changeCodevisible2">显示二维码弹窗22</div>
-  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1"/>
+  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1" type="签到二维码"/>
 </template>
 <script>
 import { reactive, toRefs } from "vue";

From a9ba5f6b5eb52d40e9f8db01c3789038232b32b1 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 08:28:05 +0800
Subject: [PATCH 45/90] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8A=BD=E5=B1=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ AssessmentList.vue    |  347 +++++
 src/components/drawers/AddActive.vue          |    1 +
 src/components/drawers/AddCase.vue            |    1 +
 src/components/drawers/AddDiscuss.vue         |    1 +
 src/components/drawers/AddEval.vue            |    1 +
 src/components/drawers/AddHomework.vue        |  135 +-
 src/components/drawers/AddInvist.vue          |  247 ++--
 src/components/drawers/AddLive.vue            |    1 +
 src/components/drawers/AddRef.vue             |    6 +-
 src/components/drawers/AddTest.vue            |  178 +--
 .../drawers/{AddVote.vue => AddVotebak.vue}   |  327 ++---
 src/components/drawers/CreVote.vue            |   19 +-
 src/components/vote/AddVote.vue               |  253 ++--
 src/components/vote/CreateVote.vue            | 1123 ++++++++---------
 src/views/learningpath/LevelAddDetail.vue     |    2 +-
 src/views/projectcenter/TaskAdd.vue           |    4 +-
 src/views/system/SystemManage.vue             |    2 +-
 17 files changed, 1381 insertions(+), 1267 deletions(-)
 create mode 100644 src/components/drawers/ AssessmentList.vue
 rename src/components/drawers/{AddVote.vue => AddVotebak.vue} (62%)

diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
new file mode 100644
index 00000000..3669d29c
--- /dev/null
+++ b/src/components/drawers/ AssessmentList.vue	
@@ -0,0 +1,347 @@
+<template>
+  <a-drawer
+    :visible="assessmentVisible"
+    class="drawerStyle addinvistDrawer"
+    width="70%"
+    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="fi_input">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 40px"
+                placeholder="请输入评估名称"
+                maxlength="20"
+              />
+            </div>
+            <div class="btns" @click="getAllInvistText">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btnsn" @click="resetInvist">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+          </div>
+          <div class="main_item2">
+            <a-table
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tableData"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              @expand="expandTable"
+              :pagination="false"
+              :row-selection="rowSelection"
+              filterMultiple:false
+            />
+
+            <div class="pa">
+              <a-pagination
+                showSizeChanger="true"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+                @change="handelChangePage"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+  
+    </div>
+  </a-drawer>
+</template>
+<script>
+import { reactive, toRefs} from "vue";
+import * as api from "../../api/indexInvist.js";
+import dayjs from "dayjs";
+export default {
+  name: "AssessmentList",
+  // components: {
+  // },
+  props: {
+      assessmentVisible: {
+      type: Boolean,
+      default: false,
+      },
+    
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      assessmentVisible:false,
+      assessment:null,
+      inputV1:"",
+      currentPage: 1,
+      pageSize: 10,
+      tableDataTotal: 0,
+      tableData: [],
+      selectedRowKeys:[],
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:assessmentVisible", false);
+      
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state getAllInvistText", bool);
+      if(props.assessmentVisible){
+        getAllInvistText();
+      }
+      
+    };
+    const tableDataFunc = () => {
+      const columns = [
+        {
+          title: "名称",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: "150px",
+          align: "left",
+          className: "classify",
+        },
+        {
+          title: "题数",
+          dataIndex: "num",
+          key: "num",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creator",
+          key: "creator",
+          width: "150px",
+          align: "center",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          width: "200px",
+          align: "center",
+        },
+      ];
+      return columns;
+    };
+    const rowSelection = {
+      type: "radio",
+      onSelect:(selectedRows,)=>{
+        state.assessment = selectedRows;
+        console.log("selectedRows=======",state.assessment);
+        ctx.emit("checkedAss", state.assessment);
+        state.selectedRowKeys = [],
+        closeDrawer();
+      }
+     
+    };
+    const handelChangePage = (page, pageSize) => {
+      state.currentPage = page;
+      state.pageSize = pageSize;
+      getAllInvistText();
+    };
+    const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        let obj = {
+          key: index,
+          assessmentId:value.assessmentId,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+        };
+        array.push(obj);
+      });
+      state.selectedRowKeys = [],
+      state.tableData = array;
+    };
+    //获取全部评估信息接口
+    const getAllInvistText = () => {
+      api
+        .queryAssessmentDetailList({
+        assessmentName:state.inputV1,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+      })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            // console.log("获取全部评估信息", res.data.data);
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部评估信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
+
+  
+    //重置评估信息
+    const resetInvist = () => {
+      state.inputV1 = "";
+      getAllInvistText();
+    };
+
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      tableDataFunc,
+      rowSelection,
+      getAllInvistText,
+      resetInvist,
+      handelChangePage,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+.addinvistDrawer {
+  .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 {
+      display: flex;
+      justify-content: space-between;
+      .main_left {
+        padding-right: 30px;
+        margin-top:32px;
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 32px;
+          .fi_input {
+            margin-right: 20px;
+          }
+          .btns {
+            margin-right: 20px;
+            padding: 0px 26px 0px 26px;
+            height: 38px;
+            background: #409eff;
+            border-radius: 8px;
+            //border: 1px solid rgba(64, 158, 255, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 14px;
+            flex-shrink: 0;
+            cursor: pointer;
+            .search {
+              width: 15px;
+              height: 17px;
+              background-image: url("../../assets/images/courseManage/search0.png");
+              background-size: 100% 100%;
+            }
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: #ffffff;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+          .btnsn {
+            padding: 0px 26px 0px 26px;
+            height: 38px;
+            background: #ffffff;
+            border-radius: 8px;
+            border: 1px solid rgba(64, 158, 255, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-right: 14px;
+            flex-shrink: 0;
+            cursor: pointer;
+            .search {
+              width: 16px;
+              height: 18px;
+              background-image: url("../../assets/images/courseManage/reset1.png");
+              background-size: 100% 100%;
+            }
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: #409eff;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+        }
+        .main_item2 {
+          .pa {
+            width: 100%;
+            margin: 15px auto;
+            display: flex;
+            justify-content: center;
+          }
+        }
+      }
+    }
+    .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/AddActive.vue b/src/components/drawers/AddActive.vue
index fb0719f1..0a265904 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -503,6 +503,7 @@ export default {
         border-radius: 8px;
       }
       .main_left {
+        margin-top:32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 93ad2825..86b9849b 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -227,6 +227,7 @@
       }
       .contentMain {
         .main_items {
+          margin-top:32px;
           display: flex;
           justify-content: space-between;
           margin-bottom: 12px;
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index b2166686..e30307f1 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -294,6 +294,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .main_left {
+        margin-top:32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 06daaada..3f894f99 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -316,6 +316,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .main_left {
+        margin-top:32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index c3c75f15..dbc751ac 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -245,7 +245,7 @@ export default {
     // };
     const handleFinish = (values) => {
       console.log(values);
-      updateWork(props.workId);
+      updteHomeWork();
     };
 
     const handleFinishFailed = (errors) => {
@@ -288,77 +288,40 @@ export default {
       console.log("state", bool);
     };
 
-    const updateWork = () => {
-      state.addLoading = true;
-      if (props.edit) {
-        // 编辑任务
-        myUpdateWorkTaskUsing();
-      } else {
-        // 创建任务
-        console.log("创建任务***************");
-        myCreateWorkTask();
-      }
-    };
+
 
     // 新增任务
-    const myCreateWorkTask = () => {
+    const updteHomeWork = () => {
       let obj = {
-        createTime: "",
-        createUser: 0,
         submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
         submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        updateTime: "",
-        updateUser: 0,
         workEnclosureAddress: "",
-        workFlag: "",
-        workId: 0,
+        workId: props.edit?props.EditWorkId:0,
         workName: formState.workName,
         workRequirement: formState.workRequirement,
-        workTag: "",
       };
-      createWorkTask(obj)
+      if(props.edit){
+        updateWorkTaskUsing(obj)
         .then((res) => {
-          if (props.isLevel) {
-            // 如果是关卡页面进入 ---------------------------------
-            myRouterEditTask(res.data.data.workId);
-          } else {
-            myProjectEditTask(res.data.data.workId);
-          }
+          updateTask(res);
+          closeDrawer();
         })
         .catch((err) => {
           message.error(`添加失败${err}`);
         });
-    };
-    // 编辑任务
-    const myUpdateWorkTaskUsing = () => {
-      let editObj = {
-        createTime: "",
-        createUser: 0,
-        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        updateTime: "",
-        updateUser: 0,
-        workEnclosureAddress: "",
-        workFlag: "",
-        workId: props.EditWorkId,
-        workName: formState.workName,
-        workRequirement: formState.workRequirement,
-        workTag: "",
-      };
-      updateWorkTaskUsing(editObj)
+      }else{
+        createWorkTask(obj)
         .then((res) => {
-          console.log(res);
-          if (props.isLevel) {
-            // 如果是关卡页面进入 ---------------------------------
-            myRouterEditTask(res.data.data.workId);
-          } else {
-            myProjectEditTask(res.data.data.workId);
-          }
+          updateTask(res);
+          closeDrawer();
         })
         .catch((err) => {
-          message.error(`编辑失败${err}`);
+          message.error(`添加失败${err}`);
         });
+      }
+      
     };
+
     // 查询任务
     const queryWork = () => {
       state.addLoading = true;
@@ -381,57 +344,49 @@ export default {
         });
     };
     // 新增编辑或新增项目任务
-    const myProjectEditTask = (workId) => {
-      let editObj = {
-        courseId: workId,
-        duration: 60,
-        flag: true,
-        name: formState.workName,
-        projectId: props.projectId,
-        projectTaskId: props.projectTaskId || 0,
-        stageId: props.chooseStageId,
-        type: 4,
-      };
-      ProjectEditTask(editObj)
-        .then((res) => {
-          console.log(` 编辑项目成功的打印 ${res}`);
-          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          ctx.emit("changeData", false);
-          state.addLoading = false;
-          closeDrawer();
-        })
-        .catch((err) => {
-          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          console.log(` 编辑项目失败的打印 ${err}`);
-        });
-    };
-    // 新增编辑或新增关卡任务
-    const myRouterEditTask = (testId) => {
-      let editObj1 = {
+    const updateTask = (res) => {
+      if(props.isLevel){
+        let editObj1 = {
         chapterId: props.isactive,
-        courseId: testId,
-        duration: 30,
-        flag: true,
-        name: formState.workName,
+        courseId: res.data.data.workId,
+        name: res.data.data.workName,
         routerId: props.routerId,
         routerTaskId: props.routerTaskId || 0,
         type: 4,
       };
 
       RouterEditTask(editObj1)
-        .then((res) => {
-          console.log(` 编辑关卡成功的打印 ${res}`);
+        .then(() => {
           message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           ctx.emit("changeData", false);
           state.addLoading = false;
-          closeDrawer();
         })
-        .catch((err) => {
+        .catch(() => {
           message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-          console.log(` 编辑关卡失败的打印 ${err}`);
         });
+      }else{
+        let editObj = {
+        courseId: res.data.data.workId,
+        name:res.data.data.workName,
+        projectId: props.edit?props.projectId:0,
+        projectTaskId: props.projectTaskId || 0,
+        stageId: props.chooseStageId,
+        type: 4,
+      };
+      ProjectEditTask(editObj)
+        .then(() => {
+          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          ctx.emit("changeData", false);
+          state.addLoading = false;
+        })
+        .catch(() => {
+          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+        });
+      }
+      
     };
 
+
     return {
       afterVisibleChange,
       closeDrawer,
@@ -446,7 +401,6 @@ export default {
       formRef,
       // layout,
       rules,
-      updateWork,
       ...toRefs(state),
     };
   },
@@ -484,6 +438,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top:32px;
 
         .main_item {
           display: flex;
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index dc7e3929..31374fc8 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -18,51 +18,38 @@
         />
       </div>
       <div class="contentMain">
+      <div class="main">
         <div class="main_left">
+          <div class="main_notice">
+          <div class="mntc_left">
+            <div class="notice_icon"></div>
+           <div v-if="assessment==null"> 
+            <span class="title">已选择 <span class ="data">0</span> 条</span>
+           </div>
+           <div v-else> 
+            <span class="title">已选择 <span class ="data">1</span> 条;</span>
+            <span class="title">名称： <span class ="data">{{assessment.name}}</span> </span>
+            <span class="title">题数： <span class ="data">{{assessment.num}}</span> </span>
+            <span class="title">创建人： <span class ="data">{{assessment.creator}}</span> </span>
+            <span class="title">创建时间： <span class ="data">{{assessment.time}}</span> </span>
+           </div>
+          </div>
+           
+          </div>
           <div class="main_item">
             <div class="fi_input">
-              <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 40px"
-                placeholder="请输入评估名称"
-                maxlength="20"
-              />
-            </div>
-            <div class="btns" @click="getAllInvistText">
+        
+            <div class="btns" @click="checkAssDrawer">
               <div class="search"></div>
-              <div class="btnText">搜索</div>
+              <div class="btnText">选择评估</div>
+              <div class="main_item2">
+              <AssessmentList 
+              v-model:assessmentVisible="assessmentVisible"
+              @checkedAss="getCheckedAss"/>
             </div>
-            <div class="btnsn" @click="resetInvist">
-              <div class="search"></div>
-              <div class="btnText">重置</div>
-            </div>
-          </div>
-          <div class="main_item2">
-            <a-table
-              style="border: 1px solid #f2f6fe"
-              :columns="tableDataFunc()"
-              :data-source="tableData"
-              :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-              @expand="expandTable"
-              :pagination="false"
-              :row-selection="rowSelection"
-              filterMultiple:false
-            />
-
-            <div class="pa">
-              <a-pagination
-                showSizeChanger="true"
-                showQuickJumper="true"
-                hideOnSinglePage="true"
-                :pageSize="pageSize"
-                :current="currentPage"
-                :total="tableDataTotal"
-                class="pagination"
-                @change="handelChangePage"
-              />
             </div>
           </div>
+         
         </div>
       </div>
       <div class="main_btns">
@@ -70,19 +57,21 @@
         <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
+  </div>
+  </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
-import * as api from "../../api/indexInvist.js";
+import { reactive, toRefs} from "vue";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import dayjs from "dayjs";
+import AssessmentList from "./ AssessmentList.vue";
 import { RouterEditTask } from "@/api/indexTask";
 export default {
   name: "AddInvist",
-  // components: {
-  // },
+  components: {
+    AssessmentList,
+  },
   props: {
     addinvistVisible: {
       type: Boolean,
@@ -134,118 +123,36 @@ export default {
       pageSize: 10,
       tableDataTotal: 0,
       tableData: [
-
       ],
       assessmentId:null,
       assessmentName:"",
-
-
+      assessment:null,
+      assessmentVisible:false,
      
     });
+    const getCheckedAss = (ass) =>{
+      state.assessment = ass
+      console.log("checed===",state.assessment);
+    }
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
       ctx.emit("update:edit", false);
       state.inputV1 = "";
     };
+    const checkAssDrawer =() =>{
+      state.assessmentVisible = true;
+    }
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    const tableDataFunc = () => {
-      const columns = [
-        {
-          title: "名称",
-          dataIndex: "name",
-          // width: "30%",
-          key: "name",
-          width: "150px",
-          align: "left",
-          className: "classify",
-        },
-        {
-          title: "题数",
-          dataIndex: "num",
-          key: "num",
-          width: "80px",
-          align: "center",
-        },
-        {
-          title: "创建人",
-          dataIndex: "creator",
-          key: "creator",
-          width: "150px",
-          align: "center",
-        },
-        {
-          title: "创建时间",
-          dataIndex: "time",
-          key: "time",
-          width: "200px",
-          align: "center",
-        },
-      ];
-      return columns;
-    };
-    const rowSelection = {
-      type: "radio",
-      onSelect: (selectedRows, selected, selectedRowKeys) => {
-        console.log(
-          "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) => {
-        let obj = {
-          key: index,
-          assessmentId:value.assessmentId,
-          num: value.essayQuestionVoList.length,
-          name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
-        };
-        array.push(obj);
-      });
-      state.tableData = array;
-    };
-    //获取全部评估信息接口
-    const getAllInvistText = () => {
-    
-      api
-        .queryAssessmentDetailList({
-        assessmentName:state.inputV1,
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-      })
-        .then((res) => {
-          let arr = res.data.data.rows;
-          if (res.status === 200) {
-            // console.log("获取全部评估信息", res.data.data);
-            getTableDate(arr);
-            state.tableDataTotal = Number(res.data.data.total);
-          }
-        })
-        .catch((err) => {
-          console.log("获取全部评估信息接口失败", err);
-          // state.createLoading = false;
-        });
-    };
+
     const updateTask =()=>{
-      console.log("jinlaile=================",state.assessmentName)
+      console.log("jinlaile=================",state.assessment.assessmentName)
       if(props.isLevel){
         RouterEditTask({
               chapterId: props.isactive,
-              courseId: state.assessmentId,
-              name: state.assessmentName,
+              courseId: state.assessment.assessmentId,
+              name: state.assessment.assessmentName,
               routerId: props.routerId,
               routerTaskId: props.routerTaskId || 0,
               type: 11,
@@ -264,8 +171,8 @@ export default {
         console.log("=========projectTaskId",props.projectTaskId);
         apiTask
             .addTask({
-              courseId: state.assessmentId,
-              name: state.assessmentName,
+              courseId: state.assessment.assessmentId,
+              name: state.assessment.assessmentName,
               projectId: props.projectId,
               projectTaskId: props.projectTaskId || 0,
               stageId: props.chooseStageId,
@@ -282,25 +189,15 @@ export default {
       }
     }
  
-    //重置评估信息
-    const resetInvist = () => {
-      state.inputV1 = "";
-      getAllInvistText();
-    };
-    onMounted(() => {
-      // createInvist();
-      getAllInvistText();
-    });
+
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      tableDataFunc,
-      rowSelection,
-      getAllInvistText,
       updateTask,
-      resetInvist,
-      handelChangePage,
+      AssessmentList,
+      checkAssDrawer,
+      getCheckedAss,
     };
   },
 };
@@ -328,14 +225,18 @@ export default {
     .contentMain {
       display: flex;
       justify-content: space-between;
+      .main{
+        width:100%;
       .main_left {
         padding-right: 30px;
+        margin-top:32px;
         .main_item {
           display: flex;
           align-items: center;
-          margin-bottom: 32px;
+          margin-bottom: 64px;
           .fi_input {
             margin-right: 20px;
+         
           }
           .btns {
             margin-right: 20px;
@@ -391,19 +292,45 @@ export default {
             }
           }
         }
-        .main_item2 {
-          .pa {
-            width: 100%;
-            margin: 15px auto;
+        .main_notice {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 32px;
+          height: 40px;
+          background-color: #e9f6fe;
+          .mntc_left {
             display: flex;
-            justify-content: center;
+            align-items: center;
+            .title{
+              color: rgba(0, 0, 0, 0.65);
+               margin-right: 17px
+            }
+            .data{
+              color: #388be1
+            }
+            .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_btns {
       height: 72px;
       width: 100%;
+      margin-top: 180px;
       bottom: 0;
       left: 0;
       display: flex;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 43904a80..788c9536 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -698,6 +698,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top:32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 687243a8..81ab5a89 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -134,10 +134,7 @@ export default {
       type: Boolean,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
-      type: Number,
-      default: null,
-    },
+
     projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
@@ -315,6 +312,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top:32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index a56544a7..b9462499 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -207,22 +207,7 @@ import {createExamination,queryExaminationDetailById,updateExamination} from "@/
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"
 
 import  dayjs from 'dayjs';
-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: "AddTest",
   // components: {
@@ -460,118 +445,51 @@ export default {
     }
     const updateTest = () => {
       state.addLoading = true;
+      let obj = {
+            "examinationDuration": formState.examinationDuration,
+            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "examinationExplain": formState.examinationExplain,
+            "examinationId":  props.edit?props.EditTestId : 0,
+            "examinationLimit": formState.examinationLimit,
+            "examinationName": formState.examinationName,
+            "examinationPaperId": 0,
+            "examinationPaperName": formState.choosedTest,
+            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+            "passLine": formState.passLine,
+            "questionArrangement": formState.questionArrangement,
+            "scoringModel": formState.scoringModel,
+            "showAnalysis": formState.showAnalysis,
+            "showAnswers": formState.showAnswers,
+      }
         if(props.edit) { // 编辑任务
-          myUpdateExamination()
+          updateExamination(obj)
+          .then((res)=>{
+          updateTask(res);
+          closeDrawer();
+          }).catch(()=>{
+            message.error(`编辑失败`)
+          });
         }else { // 创建任务
-          myCreateExamination()
-        }
+        createExamination(obj)
+        .then((res)=>{
+          updateTask(res);
+          closeDrawer();
+        }).catch(()=>{
+          message.error(`编辑失败`)
+        });
+      }
     }
     
-    const myUpdateExamination = () => {
-      let obj = {
-            "createTime": "",
-            "createUser": 0,
-            "examinationDuration": formState.examinationDuration,
-            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": formState.examinationExplain,
-            "examinationFlag": "",
-            "examinationId":  props.EditTestId,
-            "examinationLimit": formState.examinationLimit,
-            "examinationName": formState.examinationName,
-            "examinationPaperId": 0,
-            "examinationPaperName": formState.choosedTest,
-            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "examinationTag": "",
-            "passLine": formState.passLine,
-            "questionArrangement": formState.questionArrangement,
-            "scoringModel": formState.scoringModel,
-            "showAnalysis": formState.showAnalysis,
-            "showAnswers": formState.showAnswers,
-            "updateTime": "",
-            "updateUser": 0
-      }
-      updateExamination(obj).then((res)=>{
-        console.log(res);
-        // 如果是关卡页面进入 ---------------------------------
-        if(props.isLevel) {
-          myRouterEditTask(res.data.data.examinationId)
-        }else { 
-          myProjectEditTask(res.data.data.examinationId)
-        }
-      }).catch(()=>{
-        message.error(`编辑失败`)
-      })
-
-    }
-    const myCreateExamination = () => {
-      let obj = {
-            "createTime": "",
-            "createUser": 0,
-            "examinationDuration": formState.examinationDuration,
-            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": formState.examinationExplain,
-            "examinationFlag": "",
-            "examinationId":  0,
-            "examinationLimit": formState.examinationLimit,
-            "examinationName": formState.examinationName,
-            "examinationPaperId": 0,
-            "examinationPaperName": formState.choosedTest,
-            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "examinationTag": "",
-            "passLine": formState.passLine,
-            "questionArrangement": formState.questionArrangement,
-            "scoringModel": formState.scoringModel,
-            "showAnalysis": formState.showAnalysis,
-            "showAnswers": formState.showAnswers,
-            "updateTime": "",
-            "updateUser": 0
-      }
-      createExamination(obj).then((res)=>{
-        if(props.isLevel) {
-          myRouterEditTask(res.data.data.examinationId)
-        }else { 
-          myProjectEditTask(res.data.data.examinationId)
-        }
-      }).catch((err)=>{
-        message.error(`添加失败${err}`)
-      })
-    }
-    const myProjectEditTask = (testId) => {
-      let editObj = {
-        "courseId": testId,
-        "duration": 50,
-        "flag": true,
-        "name": formState.examinationName,
-        "projectId": props.projectId,
-        "projectTaskId": props.projectTaskId || null,
-        "stageId": props.chooseStageId,
-        "type": 5
-      }
-       // 新增编辑或新增项目
-       ProjectEditTask(editObj).then(res => {
-        console.log(` 编辑项目成功的打印 ${res}`);
-        message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
-        ctx.emit("changeData", false);
-        state.addLoading = false;
-        closeDrawer();
-      }).catch(err => {
-        message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
-        console.log(` 编辑项目失败的打印 ${err}`);
-      })
-    }
-
-    const myRouterEditTask = (testId) => {
-      let editObj1 = {
+    const updateTask = (res) => {
+      if(props.isLevel){
+        let editObj1 = {
             "chapterId": props.isactive,
-            "courseId": testId,
-            "duration": 30,
-            "flag": true,
-            "name": formState.examinationName,
+            "courseId": res.data.data.examinationId,
+            "name": res.data.data.examinationName,
             "routerId": props.routerId,
             "routerTaskId":  props.routerTaskId || 0,
             "type": 5
           }
-
           RouterEditTask(editObj1).then(res => {
             console.log(` 编辑关卡成功的打印 ${res}`);
             message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
@@ -581,7 +499,26 @@ export default {
           }).catch(err => {
             message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
             console.log(` 编辑关卡失败的打印 ${err}`);
-          })
+          });
+      }else{
+          let editObj = {
+          "courseId": res.data.data.examinationId,
+          "duration": 0,
+          "name": res.data.data.examinationName,
+          "projectId": props.projectId,
+          "projectTaskId": props.projectTaskId || 0,
+          "stageId": props.chooseStageId,
+          "type": 5
+        }
+        // 新增编辑或新增项目
+        ProjectEditTask(editObj).then(() => {
+          message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
+          ctx.emit("changeData", false);
+        }).catch(() => {
+          message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
+        });
+      }
+      
     }
 
     const cloradio1 = (value) => {
@@ -608,7 +545,6 @@ export default {
       formState,
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       cloradio1,
       cloradio2,
       cloradio3,
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVotebak.vue
similarity index 62%
rename from src/components/drawers/AddVote.vue
rename to src/components/drawers/AddVotebak.vue
index 9986004b..2b579eae 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVotebak.vue
@@ -75,8 +75,7 @@
               <cre-vote
                 v-model:crevoteVisible="crevotevisible"
                 @getData="getStemId"
-                v-model:voteStemId="voteStemId"
-                v-model:editStem="editStem"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -122,42 +121,21 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2" @click="creoredi()">确定</button>
+        <button class="btn1" @click="closeDrawer()">取消</button>
+        <button class="btn2" @click="updateVoteInfo()">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
-import CreVote from "../../components/drawers/CreVote.vue";
+import { reactive, toRefs} from "vue";
+import CreVote from "./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);
-  },
-});
+import dayjs from "dayjs";
+import * as apiTask from "../../api/indexTaskadd";
+
 
 export default {
   name: "AddVote",
@@ -173,9 +151,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    learn: {
+    voteId: {
       type: Number,
-      default: 0,
+      default: null,
     },
     projectId: {
       type: Number,
@@ -185,83 +163,71 @@ export default {
       type: Number,
       default: null,
     },
-    voteId: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
     },
-    ballotId: {
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
       type: Number,
       default: null,
     }
+
+
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       textV1: "",
-      creVote: false,
       crevotevisible: false,
       time: undefined,
+      startTime:"",
+      endTime:"",
       basevote: "",
-      endTimes: "",
-      startTimes: "",
       ascriptionId: "",
       voteStemId: null,
       voteId:"",
       voteStemName:"",
       ballotName: "",
       editStem: false,  //编辑状态
-      ballotId: "", //题干id
+      ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
     });
     const closeDrawer = () => {
-      state.inputV1 = "",
+        state.inputV1 = "",
         state.textV1 = "",
-        state.startTimes = "",
         state.time = undefined,
-        state.endTimes = "",
         state.basevote = "",
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      // if (props.edit == true) {
-      //   queryVoteText()
-      // }
+        queryVoteInfo();
     };
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
-      if (state.creVote == true) {
-        state.editStem = true
-      }
     };
     const getStemId = (data) => {
       state.ballotName = data.ballotName;
-      state.voteStemName = data.voteStemName;
-      state.voteStemId = Number(data.voteStemId);
-      state.ballotId = Number(data.ballotId)
-      state.creVote = data.creVote;
-      console.log('state.voteStemId', state.voteStemId);
-      console.log('state.voteStemId', state.creVote);
+      state.ballotId =data.ballotId;
     }
-    //暂时没用 之前给子用传参来着
-    // 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 = {
@@ -275,17 +241,68 @@ export default {
       })
     }
 
-    //新建还是编辑方法
-    const creoredi = () => {
-      if (props.eidt == false) {
-        createVoteText()
+    //根据投票id获取投票信息
+     const queryVoteInfo = ()=>{
+    /** 
+       let obj = {
+        voteId:props.voteId
       }
-      else {
-        changeVoteText()
+      .queryVoteText(obj)
+       .then((res)=>{
+        console.log('获取投票信息成功',res);
+        state.inputV1 = res.data.data.voteName
+        state.time = [dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD"), dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD")]
+        state.textV1 = res.data.data.voteExplain
+        state.baseVote = res.data.data.baseVote
+        state.ascriptionId = res.data.data.ascriptionId
+        state.ballotId = res.data.data.ballotId
+       })
+       .catch((err)=>{
+         console.log('获取投票信息失败',err);
+       })
+       **/
+      
+     }
+     const updateToTask =(res)=>{
+      if(props.isLevel){
+        RouterEditTask({
+          chapterId: props.isactive,
+          courseId: res.data.data.voteId,
+          name: res.data.data.voteName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 12,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;               
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      }else{
+        apiTask
+          .addTask({
+            courseId:res.data.data.voteId,
+            name: res.data.data.voteName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 12,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);   
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
       }
     }
-    //创建投票信息
-    const createVoteText = () => {
+    //修改投票信息接口
+    const updateVoteInfo = () => {
       if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
@@ -294,137 +311,47 @@ export default {
       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.time != undefined){
+        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
+        state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
-
       let obj = {
+        voteId: props.edit?state.voteId : 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTime,
+        voteEndTime: state.endTime,
         ballotId: state.ballotId,
         baseVote: state.basevote,
-        createTime: "",
-        createUser: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: state.endTimes,
-        voteExplain: state.textV1,
-        voteFlag: "",
-        voteId: 0,
-        voteName: state.inputV1,
-        voteStartTime: state.startTimes,
-        voteTag: ""
-
-      };
-      api
-        .createVote(obj)
-        .then((res) => {
-          console.log("创建成功123", res);
-          message.success("创建成功");
-          let changeVoteId = {
-            voteId: res.data.data.voteId,
-            ballotId: state.ballotId,
-          }
-          ctx.emit("getData", changeVoteId);
-          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);
-        });
-    };
-
-    //根据投票id获取投票信息
-    // const queryVoteText = ()=>{
-    //   let objqurvt = {
-    //     voteStemId:state.voteStemId
-    //     //没有接口 个人认为应该是这个id
-    //   }
-    //   api
-    //   //目前没接口 大概写的
-    //   .queryVoteText(objqurvt)
-    //   .then((res)=>{
-    //     console.log('获取投票信息成功',res);
-    //      state.inputV1 = res.data.data.voteName
-    //      state.endTimes = res.data.data.voteEndTime
-    //      state.startTimes = res.data.data.voteStartTime
-    //      state.textV1 = res.data.data.voteExplain
-    //      state.baseVote = res.data.data.baseVote
-    //      state.ascriptionId = res.data.data.ascriptionId
-    //      state.ballotId = res.data.data.ballotId
-    //   })
-    //   .catch((err)=>{
-    //     console.log('获取投票信息失败',err);
-    //   })
-    // }
-    //修改投票信息接口
-    const changeVoteText = () => {
-      let objcvt = {
-        ballotId: state.ballotId,
-        baseVote: state.basevote,
-        createTime: "",
-        createUser: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: state.endTimes,
-        voteExplain: state.textV1,
-        voteFlag: "",
-        voteId: state.voteId,
-        voteName: state.inputV1,
-        voteStartTime: state.startTimes,
-        voteTag: ""
+        voteExplain: state.textV1, 
+        createUser:0,
+        updateUser:0,
+        voteTag:"",
       }
-      api
-        .editVote(objcvt)
+      if(props.edit){
+        api
+        .editVote(obj)
         .then((res) => {
+          updateToTask(res);
+          closeDrawer();
           console.log('修改投票信息成功', res);
         })
         .catch((err) => {
           console.log('修改投票信息失败', err);
         })
+      }else{
+        api
+        .createVote(obj)
+        .then((res) => {
+          updateToTask(res);
+          closeDrawer();
+          console.log('创建投票信息成功', res);
+        })
+        .catch((err) => {
+          console.log('创建投票信息失败', err);
+        })
+      }
+      
     }
     return {
       ...toRefs(state),
@@ -432,16 +359,11 @@ export default {
       afterVisibleChange,
       closeDrawer,
       getStemId,
-      // changeVData,
-      rowSelection,
-      options1,
+      queryVoteInfo,
       dleVoteStem,
-      creoredi,
-      createVoteText,
-      changeVoteText,
+      updateVoteInfo,
       delBox,
-      // queryVoteText,
-      updateTableData,
+      
     };
   },
 };
@@ -474,6 +396,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top: 32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index a0e4dbf8..48e9933e 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -123,9 +123,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    editStem: {
-      type: Boolean,
-      default: false,
+    ballotId: {
+      type: Number,
+      default: null,
     },
   },
   setup(props, ctx) {
@@ -204,13 +204,13 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      if (props.editStem == true) {
+      if (props.ballotId != 0) {
         queryStemText()
       }
     };
     //创建题干还是编辑题干
     const creoredi = () => {
-      if (props.eidtStem == false) {
+      if (props.ballotId) {
         createQueTit()
       }
       else {
@@ -320,13 +320,11 @@ export default {
     }
     //根据id获取题干信息
     const queryStemText = () => {
-      let objqurst = {
-        stemId: 1,
-        ballotId: "",
-      }
       api
-        .queryStemByStemId(objqurst)
+        .queryStemByStemId({ballotId:props.ballotId})
         .then((res) => {
+       
+ 
           console.log('获取题干信息成功', res);
           state.inputV1 = res.data.data.voteName
         })
@@ -436,6 +434,7 @@ export default {
         display: flex;
         align-items: center;
         margin-bottom: 32px;
+        margin-top: 32px;;
         .signbox {
           width: 120px;
           display: flex;
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 57cbf792..198af544 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div  class="headerTitle">添加投票任务</div>
+        <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"
@@ -32,7 +33,7 @@
               <a-input
                 v-model:value="inputV1"
                 style="width: 424px; height: 32px"
-                placeholder="请输入任务名称"
+                placeholder="请输入投票名称"
                 maxlength="20"
               />
             </div>
@@ -51,29 +52,37 @@
               <button
                 class="xkbtn"
                 :style="{ display: creVote ? 'none' : 'block' }"
-                @click="showDrawerCreateVote"
+                @click="showDrawerCreVote"
               >
                 创建投票
               </button>
+              <div>
+            <CreateVote
+              v-model:createVoteVisible="createVoteVisible"
+              v-model:ballotId="ballotId"
+              v-model:editChild="editChild"
+            />
+          </div>
               <button
                 class="xkbtn"
                 :style="{ display: creVote ? 'block' : 'none' }"
-                @click="showDrawerCreateVote"
+                @click="showDrawerCreVote"
               >
                 编辑投票
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{voteStemName}}</span>
-                  <div class="delBox" @click="delBox()"></div>
+                  <span style="color: #388be1">{{ballotName}}</span>
+                  <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
             </div>
             <!-- 创建投票侧弹窗 -->
             <div>
-              <CreateVote
-                v-model:createVoteVisible="createVoteVisible"
-          
+              <cre-vote
+                v-model:crevoteVisible="crevotevisible"
+                @getData="getStemId"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -85,7 +94,6 @@
             <div class="btnbox">
               <a-range-picker
                 style="width: 424px"
-                v-model:value="time"
                 :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -120,38 +128,38 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2" @click="createVoteText()">确定</button>
+        <button class="btn1" @click="closeDrawer()">取消</button>
+        <button class="btn2" @click="updateVoteInfo()">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, toRefs} from "vue";
-import CreateVote from "./CreateVote.vue";
+import CreVote 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";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
+import * as apiTask from "../../api/indexTaskadd";
+
 
 export default {
   name: "AddVote",
   components: {
-    CreateVote,
+    CreVote,
   },
   props: {
     addvoteVisible: {
       type: Boolean,
       default: false,
     },
-    EditVoteId:{
-      type: Number,
-      default: 0,
-    },
-    edit: { //  是否为编辑
+    edit: {
       type: Boolean,
+      default: false,
+    },
+    voteId: {
+      type: Number,
       default: null,
     },
     projectId: {
@@ -182,36 +190,55 @@ export default {
       type: Number,
       default: null,
     }
-  
+
+
   },
   setup(props, ctx) {
     const state = reactive({
-      voteName: "",
-      voteExplain: "",
+      inputV1: "",
+      textV1: "",
       createVoteVisible: false,
       time: undefined,
+      startTime:"",
+      endTime:"",
       basevote: "",
       ascriptionId: "",
+      voteStemId: null,
+      voteId:"",
+      voteStemName:"",
+      ballotName: "",
+      editStem: false,  //编辑状态
+      ballotId: 0, //题干id
+      optionId: "", //删除，修改选项id
+      editChild:false,
     });
     const closeDrawer = () => {
-
+        state.inputV1 = "",
+        state.textV1 = "",
+        state.time = undefined,
+        state.basevote = "",
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+        queryVoteInfo();
     };
-    const showDrawerCreateVote = () => {
+    const showDrawerCreVote = () => {
       state.createVoteVisible = true;
-      console.log("进来了====");
-    };
-    const changeVData = (data) => {
-      state.ascriptionId = data.ascriptionId;
+      state.editChild = props.edit;
+      console.log("=======前")
 
     };
+    const getStemId = (data) => {
+      state.ballotName = data.ballotName;
+      state.ballotId =data.ballotId;
+    }
+
     const delBox = () => {
-      dleVoteStem()
+      state.creVote = false;
     };
+
     //删除题干信息接口
     const dleVoteStem = () => {
       let objdelstem = {
@@ -221,106 +248,133 @@ export default {
         .then((res) => {
           console.log('删除题干信息成功', res)
           message.success('删除题干信息成功')
+          delBox()
       })
     }
-    const updteVote = (res) =>{
-      if (props.isLevel)
-            apitaskadd
-              .addTask({
-                courseId: res.data.data.voteId,
-                name: res.data.data.voteName,
-                projectId: props.projectId,
-                projectTaskId:props.projectTaskId || 0,
-                stageId: props.chooseStageId,
-                type: 12,
-              })
-              .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                ctx.emit("changeData", false);
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          else {
-            RouterEditTask({
-              chapterId: props.isactive,
-              courseId: res.data.data.voteId,
-              name: res.data.data.voteName,
-              routerId: props.routerId,
-              routerTaskId: props.routerTaskId,
-              type: 12,
-            }) .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                ctx.emit("changeData", false);
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          }
+
+    //根据投票id获取投票信息
+     const queryVoteInfo = ()=>{
+    /** 
+       let obj = {
+        voteId:props.voteId
+      }
+      .queryVoteText(obj)
+       .then((res)=>{
+        console.log('获取投票信息成功',res);
+        state.inputV1 = res.data.data.voteName
+        state.time = [dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD"), dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD")]
+        state.textV1 = res.data.data.voteExplain
+        state.baseVote = res.data.data.baseVote
+        state.ascriptionId = res.data.data.ascriptionId
+        state.ballotId = res.data.data.ballotId
+       })
+       .catch((err)=>{
+         console.log('获取投票信息失败',err);
+       })
+       **/
+      
+     }
+     const updateToTask =(res)=>{
+      if(props.isLevel){
+        RouterEditTask({
+          chapterId: props.isactive,
+          courseId: res.data.data.voteId,
+          name: res.data.data.voteName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 12,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;               
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      }else{
+        apiTask
+          .addTask({
+            courseId:res.data.data.voteId,
+            name: res.data.data.voteName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 12,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);   
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      }
     }
-    //创建投票信息
-    const createVoteText = () => {
-      if (!state.voteName) {
+    //修改投票信息接口
+    const updateVoteInfo = () => {
+      if (!state.inputV1) {
         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"
-        );
+      if(state.time != undefined){
+        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
+        state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
       let obj = {
-        ascriptionId: state.ascriptionId,
+        voteId: props.edit?state.voteId : 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTime,
+        voteEndTime: state.endTime,
+        ballotId: state.ballotId,
         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"),
-      };
+        voteExplain: state.textV1, 
+        createUser:0,
+        updateUser:0,
+        voteTag:"",
+      }
       if(props.edit){
         api
         .editVote(obj)
         .then((res) => {
-          console.log("创建成功123", res);
-          message.success("创建成功");
-          updteVote(res);
+          updateToTask(res);
           closeDrawer();
-          
+          console.log('修改投票信息成功', res);
         })
         .catch((err) => {
-          console.log("创建失败", err);
-        });
+          console.log('修改投票信息失败', err);
+        })
       }else{
         api
         .createVote(obj)
         .then((res) => {
-          updteVote(res);
+          updateToTask(res);
           closeDrawer();
-          
+          console.log('创建投票信息成功', res);
         })
         .catch((err) => {
-          console.log("创建失败", err);
-        });
-      } 
-    };
+          console.log('创建投票信息失败', err);
+        })
+      }
+      
+    }
     return {
       ...toRefs(state),
-      showDrawerCreateVote,
+      showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,
-      changeVData,
+      getStemId,
+      queryVoteInfo,
       dleVoteStem,
-      createVoteText,
+      updateVoteInfo,
       delBox,
+      
     };
   },
 };
@@ -353,6 +407,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top: 32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 2b9d3e18..e79d4b4d 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -1,91 +1,91 @@
 <!-- 评估管理-创建评估页面 -->
 <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"
+  <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>
-        </div>
-      <div class="main_item">
-        <div class="signbox">
-          <div class="sign">
-            <img
-              src="@/assets/images/coursewareManage/asterisk.png"
-              alt=""
+            <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>
-          <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 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"
+      :ballotId="ballotId"
+      @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>
@@ -95,558 +95,527 @@ import { reactive,toRefs} from "vue";
 import VoteQuestion from "./VoteQuestion.vue";
 
 import {
-  sortBy,
-  traverseArr,
-  filterCommon,
-  deepCloneFilterString,
+// sortBy,
+traverseArr,
+// filterCommon,
+// deepCloneFilterString,
 } from "../../utils/utils";
 
-import { useRouter } from "vue-router";
+
 //import store from "@/store";
 import {
-  queryResearchDetailById,
-  editResearchMessage,
-  createResearch,
+//createOptionMessage,
+queryStemByStemId
+}from "@/api/indexVote";
+import {
+
+
+
 
 } from "@/api/indexResearch";
-import { message } from "ant-design-vue";
+//import { message } from "ant-design-vue";
+
 
 export default {
-  name: "CreateVote",
-  components: {
-    VoteQuestion,
+name: "CreateVote",
+components: {
+  VoteQuestion,
 
+},
+props: {
+  createVoteVisible: {
+    type: Boolean,
+    default: false,
   },
-  props: {
-    createVoteVisible: {
-      type: Boolean,
-      default: false,
-    },
+  ballotId: {
+    type: Number,
+    default: null,
+  },
+  editChild: {
+    type: Boolean,
+    default: false,
+  },
+  
+},
+setup(props,ctx) {
+  const state = reactive({
+    ballotId: "", 
+    ballotName: "",
+    allFormsData: [],
+
+  });
+  const afterVisibleChange = (bool) => {
+    console.log("state======进来creates", bool);
+    handleTypes();
+  };
+  const closeDrawer = () => {
+    ctx.emit("update:createVoteVisible", 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);
+    console.log("======关闭");
+  }
+  // 详情
+  const getInfoDate = async () => {
+    if (props.editChild) {
+      //stemId 多余字段
+      let res = await queryStemByStemId({stemId:0,
+        ballotId: state.ballotId,
+      }).then((res) => {
+        if (res.data.code === 200) {
+          return res.data.data;
         }
       });
-      resultArr.map((itm, idx) => {
+      state.ballotName = res[0].ballotId;
+      let renderArr = [
+        ...res,
+      ];
+      // sortBy(renderArr, "orderNumber"); //序号
+      state.allFormsData = parseData(renderArr); //类型
+      // console.log("state.allFormsData");
+      // console.log(state.allFormsData);
+    }
+  };
+  getInfoDate();
+
+  // 转换成前端格式
+  const parseData = (arr) => {
+    const resultArr = [];
+    arr.forEach((item) => {
+      let obj = {};
+      let restList = traverseArr(item.optionDetailList, {
+        inputVal: "singleOptionName",
+        imgVal: "singleOptionPictureAddress",
+        optionId: "singleOptionId",
+      }).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,
-     
+      obj = {
+        voteStemName: item.singleStemName,
+        singleList: restList,
+      };
+      resultArr.push(obj);
       
-    };
 
-    const handleSave = () => {
-      let resultPost = {};
-      let filterData = parseItem(restData(state.allFormsData, "type"));
-      // 校验
-      if (!checkVal(filterData)) {
-        return false;
-      }
-      console.log(12121212);
-      console.log(filterData);
+    });
+    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
+            : "";
+        });
 
-      if (state.assessmentId) {
-        resultPost = {
-          assessmentId: state.assessmentId,
-          assessmentName: state.assessmentName,
-          assessmentMark: state.valueMore,
-          ...filterData,
+        obj = {
+          questionType: item[typeKey],
+          singleStemName: item.valueSingle,
+          singleList: restList,
+          orderNumber: item.orderNumber,
         };
-        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",
+        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,
+              });
             });
           }
         });
-      } 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",
+        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;
       }
-    };
-    const handleAllCancel = () => {
-      state.allFormsData = [];
-      router.push({
-        path: "/researchmanage",
+      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.ballotId) {
+      resultPost = {
+        ballotId: state.ballotId,
+        ballotName: state.ballotName,
+        ...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",
+          });
+        }
       });
-    };
-    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;
-          }
+    } else {
+      resultPost = {
+        ballotName: state.ballotNameNew,
+        assessmentMark: state.valueMore,
+        ...filterData,
+      };
+      resultPost = deepCloneFilterString(resultPost, [
+        "assessmentMaxScore",
+        "assessmentMinScore",
+      ]);
+      createOptionMessage(resultPost).then((res) => {
+        if (res.data.code === 200) {
+          message.success("创建成功");
+        
         }
-      }
-      // 多选
-      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("当前权重设置是百分制 请重新配置");
+      });
+    }
+    */
+  };
+  const handleAllCancel = () => {
+    state.allFormsData = [];
+  
+  };
+  /** 
+  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.assessmentSingleChoiceDtoList &&
-        filterData.assessmentSingleChoiceDtoList.length
-      ) {
-        let arr = filterData.assessmentSingleChoiceDtoList;
-        for (let item of arr) {
-          if (!item.singleStemName) {
-            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;
         }
       }
-      return true;
-    };
+    }
+    // 评分
+    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,
-    };
-  },
+  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;
-      }
+.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 {
+  }
+  .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;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
+          .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;
-            justify-content: end;
             align-items: center;
-            .sign {
+            padding: 3px 5px;
+            background-color: rgba(42, 103, 209, 0.4);
+            span {
               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;
+            .delBox {
+              width: 13px;
+              height: 13px;
+              background-image: url(@/assets/images/basicinfo/ch.png);
+              background-size: 100% 100%;
+              border-radius: 50%;
             }
-            .fileTigan {
+          }
+        }
+      }
+      .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;
-              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%;
-              }
+              flex-wrap: nowrap;
             }
           }
         }
-        .main_item2 {
+        .btnbox2 {
           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;
-            }
+          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/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index aea37d17..47e89683 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -908,7 +908,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";
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index bfa79cc6..2ed5f715 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -877,10 +877,10 @@ import AddTest from "../../components/drawers/AddTest.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
-import AddActive from "../../components/drawers/AddActive.vue";
+import AddActive from "../../components/drawers/AddActive.vue";s
 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 apistage from "../../api/indexStage";
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 215b48f6..6c7271f8 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -98,7 +98,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 cfac944696ec03cddb3006d6b482dc3f4619ea38 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 09:07:51 +0800
Subject: [PATCH 46/90] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 80 +++++++++++++++++++------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index e8687d52..63c19be7 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -271,32 +271,17 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click ="updateFaceTeach">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs} from "vue";
 import SelFacet from "../../components/drawers/SelFacet.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
-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: "AddFaceteach",
   components: {
@@ -309,6 +294,47 @@ export default {
       type: Boolean,
       default: false,
     },
+    EditEvalId: {
+      // 要编辑的workId
+      type: Number,
+      default: null,
+    },
+    edit: {
+      //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: {
+      // 是否是关卡页面触发
+      type: Number,
+      default: null,
+    },
+
+    projectTaskId: {
+      // 要编辑的projectId
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -333,6 +359,9 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if(bool){
+        queryFaceTeach();
+      }
     };
     const showDrawerSelFacet = () => {
       state.selfacetvisible = true;
@@ -353,6 +382,18 @@ export default {
         state.radioV2 = "";
       }
     }
+    //查询面授
+    const queryFaceTeach=()=>{
+
+    }
+     //更新任务列表
+     const updateTask=()=>{
+
+    }
+     //新建或编辑面授
+     const updateFaceTeach=()=>{
+    
+    }
     return {
       ...toRefs(state),
       showDrawerSelFacet,
@@ -360,9 +401,10 @@ export default {
       showDrawerAddTest,
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       cloradio1,
       cloradio2,
+      updateFaceTeach,
+      updateTask,
       // change,
     };
   },

From 1108dfa0180c88546c1f4302db62bf172c410382 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 09:28:39 +0800
Subject: [PATCH 47/90] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?islevel=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue      |  8 +++---
 src/components/drawers/AddCase.vue        |  8 +++---
 src/components/drawers/AddDiscuss.vue     |  9 ++++---
 src/components/drawers/AddEval.vue        |  8 +++---
 src/components/drawers/AddHomework.vue    |  8 +++---
 src/components/drawers/AddInvist.vue      | 20 +++++++++------
 src/components/drawers/AddLive.vue        |  8 +++---
 src/components/drawers/AddOnline.vue      |  9 ++++---
 src/components/drawers/AddRef.vue         | 10 +++++---
 src/components/drawers/AddTest.vue        |  8 +++---
 src/components/vote/AddVote.vue           |  8 +++---
 src/views/learningpath/LevelAddDetail.vue | 19 +++++++-------
 src/views/projectcenter/TaskAdd.vue       | 30 +++++++++++++++++------
 13 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 910ebbbd..30b44ff3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -275,7 +275,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     EditWorkId: { // 要编辑的workId 
@@ -358,7 +358,7 @@ export default {
       }
     };
     const updateTask = (res) => {
-      if(props.isLevel){
+      if(props.isLevel == 1 ){
         RouterEditTask({
             chapterId:props.isactive,
             courseId: res.data.data.activityId,
@@ -373,7 +373,7 @@ export default {
           }).catch(err => {
             console.log("新增关卡任务失败",err);
           })
-      }else{
+      }else if(props.isLevel==2){
         apiTask.addTask({
             courseId: res.data.data.activityId,
             duration: res.data.data.activityDuration,
@@ -389,6 +389,8 @@ export default {
           .catch((err)=> {
             console.log("更新任务列表失败",err);
           })
+      }else if(props.isLevel == 3){
+        console.log("模板库更新更新任务列表");
       }
     }
     //创建活动
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 1bc0a931..de4d8c9d 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -107,7 +107,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -229,7 +229,7 @@ export default {
     };
     const updateTask = () => {
       console.log("jinlaile=================", state.assessmentName)
-      if (props.isLevel) {
+      if (props.isLevel==1) {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: state.assessmentId,
@@ -248,7 +248,7 @@ export default {
           .catch((err) => {
             console.log(err, 1111);
           });
-      } else {
+      } else if(props.isLevel==2){
         console.log("=========projectTaskId", props.projectTaskId);
         apiTask
           .addTask({
@@ -267,6 +267,8 @@ export default {
           .catch((err) => {
             console.log(err, 111111);
           });
+      }else if(props.isLevel==3){
+        console.log("模板库");
       }
     }
     //重置案例信息
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index abafd842..588fe1b9 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -121,7 +121,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     EditWorkId: { // 要编辑的workId 
@@ -189,8 +189,7 @@ export default {
       }
     };
     const updateTask = (res) => {
-    console.log("jinlaile ========",props.isLevel);
-        if(props.isLevel){
+        if(props.isLevel ==1){
           RouterEditTask({
             chapterId:props.isactive,
             courseId: res.data.data.discussId,
@@ -201,7 +200,7 @@ export default {
           }).then(res => { 
               console.log("新增关卡任务失败",res);
           }).catch(err => {console.log("新增关卡任务失败",err);})
-        }else{
+        }else if(props.isLevel ==2){
         apiTask
         .addTask({
           courseId: res.data.data.discussId,
@@ -215,6 +214,8 @@ export default {
         }).catch(r=>{
           console.log('更新阶段任务失败',r)
         })
+        }else if(props.isLevel ==3){
+          console.log("模板库任务")
         }
     }
     const updateDiscussInfo = () => {
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 04175759..daf6e24b 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -135,7 +135,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -195,7 +195,7 @@ export default {
         });
     }
     const updateTask = (res)=>{
-      if(props.isLevel){
+      if(props.isLevel ==1){
         apitaskadd
             .addTask({
               courseId: res.data.data.evaluationId,
@@ -212,7 +212,7 @@ export default {
             .catch((err) => {
               console.log(err);
             });
-      }else{
+      }else if(props.isLevel ==2){
         RouterEditTask({
                 chapterId: props.isactive,
                 courseId: res.data.data.evaluationId,
@@ -226,6 +226,8 @@ export default {
             }).catch((err) => {
               console.log(err);
             });
+      }else if(props.isLevel ==3){
+          console.log("模板库任务")
       }
     }
     //创建或编辑测评信息
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 5b894725..8c0dbe82 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -161,7 +161,7 @@ export default {
     },
     isLevel: {
       // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     EditWorkId: {
@@ -345,7 +345,7 @@ export default {
     };
     // 新增编辑或新增项目任务
     const updateTask = (res) => {
-      if(props.isLevel){
+      if(props.isLevel==1 ){
         let editObj1 = {
         chapterId: props.isactive,
         courseId: res.data.data.workId,
@@ -364,7 +364,7 @@ export default {
         .catch(() => {
           message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
         });
-      }else{
+      }else if(props.isLevel==2){
         let editObj = {
         courseId: res.data.data.workId,
         name:res.data.data.workName,
@@ -382,6 +382,8 @@ export default {
         .catch(() => {
           message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
         });
+      }else if(props.isLevel==3){
+        console.log("模板库更新更新任务列表");
       }
       
     };
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 31374fc8..57fa3d0e 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -98,9 +98,10 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
+  
     projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
@@ -112,7 +113,7 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   
   },
   setup(props, ctx) {
@@ -147,12 +148,14 @@ export default {
     };
 
     const updateTask =()=>{
-      console.log("jinlaile=================",state.assessment.assessmentName)
-      if(props.isLevel){
+      if(state.assessment==null){
+        return message.warning("请选择评估");
+      }
+      if(props.isLevel ==1){
         RouterEditTask({
               chapterId: props.isactive,
               courseId: state.assessment.assessmentId,
-              name: state.assessment.assessmentName,
+              name:state.assessment.name,
               routerId: props.routerId,
               routerTaskId: props.routerTaskId || 0,
               type: 11,
@@ -167,12 +170,11 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-      }else{
-        console.log("=========projectTaskId",props.projectTaskId);
+      }else if(props.isLevel ==2){
         apiTask
             .addTask({
               courseId: state.assessment.assessmentId,
-              name: state.assessment.assessmentName,
+              name:state.assessment.name,
               projectId: props.projectId,
               projectTaskId: props.projectTaskId || 0,
               stageId: props.chooseStageId,
@@ -186,6 +188,8 @@ export default {
             .catch((err) => {
               console.log(err, 111111);
             });
+      }else if(props.isLevel == 3){
+        console.log("模板库更新更新任务列表");
       }
     }
  
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 5fa5b4f1..1906acd2 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -355,7 +355,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -497,7 +497,7 @@ export default {
       return isJpgOrPng && isLt2M;
     };
     const updateTask =(res)=>{
-      if(props.isLevel){
+      if(props.isLevel ==1){
             RouterEditTask({
               chapterId: props.isactive,
               courseId: res.data.data.liveId,
@@ -515,7 +515,7 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-          }else{
+          }else if(props.isLevel ==2){
             apiTask
               .addTask({
                 courseId: res.data.data.liveId,
@@ -536,6 +536,8 @@ export default {
                 console.log(err);
               });
          
+          }else if(props.isLevel ==3){
+            console.log("mobnku");
           }
     }
     //创建直播
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 34b6b274..939b00b9 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -141,7 +141,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -281,8 +281,7 @@ export default {
         });
     };
   const updateTask =()=>{
-      console.log("jinlaile=================",state.assessmentName)
-      if(props.isLevel){
+      if(props.isLevel ==1){
         RouterEditTask({
               chapterId: props.isactive,
               courseId: state.assessmentId,
@@ -301,7 +300,7 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-      }else{
+      }else if(props.isLevel ==2){
         console.log("=========projectTaskId",props.projectTaskId);
         apiTask
             .addTask({
@@ -320,6 +319,8 @@ export default {
             .catch((err) => {
               console.log(err, 111111);
             });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
     }
     //重置在线信息
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 81ab5a89..0be363bf 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -131,7 +131,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
 
@@ -183,8 +183,8 @@ export default {
       // message.error("handleFinishFailed");
     };
     const updateTask =(res)=>{
-      console.log("jinlaile=================",res.data.data.linkId,props.isLevel,props.isactive,props.routerId,props.routerTaskId)
-      if(props.isLevel){
+      
+      if(props.isLevel ==1){
         RouterEditTask({
               chapterId: props.isactive,
               courseId: res.data.data.linkId,
@@ -203,7 +203,7 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-      }else{
+      }else if(props.isLevel ==2){
         apiTask
             .addTask({
               courseId:res.data.data.linkId,
@@ -221,6 +221,8 @@ export default {
             .catch((err) => {
               console.log(err, 111111);
             });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
     }
     //创建外链
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index c40c93b8..c04ab2be 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -242,7 +242,7 @@ export default {
       default: null,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -481,7 +481,7 @@ export default {
     }
     
     const updateTask = (res) => {
-      if(props.isLevel){
+      if(props.isLevel == 1){
         let editObj1 = {
             "chapterId": props.isactive,
             "courseId": res.data.data.examinationId,
@@ -500,7 +500,7 @@ export default {
             message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
             console.log(` 编辑关卡失败的打印 ${err}`);
           });
-      }else{
+      }else if(props.isLevel ==2){
           let editObj = {
           "courseId": res.data.data.examinationId,
           "duration": 0,
@@ -517,6 +517,8 @@ export default {
         }).catch(() => {
           message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
         });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
       
     }
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 198af544..812d5f18 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -175,7 +175,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -275,7 +275,7 @@ export default {
       
      }
      const updateToTask =(res)=>{
-      if(props.isLevel){
+      if(props.isLevel ==1){
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.voteId,
@@ -293,7 +293,7 @@ export default {
           .catch((err) => {
             console.log(err, 1111);
           });
-      }else{
+      }else if(props.isLevel ==2){
         apiTask
           .addTask({
             courseId:res.data.data.voteId,
@@ -310,6 +310,8 @@ export default {
           .catch((err) => {
             console.log(err, 111111);
           });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
     }
     //修改投票信息接口
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 47e89683..2e720f90 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -243,7 +243,7 @@
           <div>
             <add-homework
               v-model:addhomeworkVisible="addhomeworkvisible"
-              :isLevel="true"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:edit="edit"
@@ -266,7 +266,7 @@
           <div>
             <add-test
               v-model:addtestVisible="addtestvisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:edit="edit"
@@ -288,7 +288,7 @@
           <div>
             <add-live
               v-model:addliveVisible="addlivevisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:routerId="routerId"
@@ -310,7 +310,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:routerId="routerId"
@@ -333,7 +333,7 @@
             <add-discuss
               v-model:adddiscussVisible="adddiscussvisible"
               @changeData="updateTableData"
-              :isLevel="true"
+             :isLevel="isLevel"
               v-model:isactive="isactive"
               v-model:edit="edit"
               v-model:routerId="routerId"
@@ -354,7 +354,7 @@
           <div>
             <add-active
               v-model:addactiveVisible="addactivevisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               v-model:edit="edit"
               v-model:isactive="isactive"
               @changeData="updateTableData"
@@ -376,7 +376,7 @@
             <div>
               <add-eval
                 v-model:addevalVisible="addevalvisible"
-                :isLevel="true"
+               :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -399,7 +399,7 @@
             <div>
               <add-invist
                 v-model:addinvistVisible="addinvistvisible"
-                :isLevel="true"
+               :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -423,7 +423,7 @@
             <div>
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
-                :isLevel="true"
+               :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -1162,6 +1162,7 @@ export default {
       value2: "",
       selectedRowKeys: [],
       edit: false, //是否点击编辑
+      isLevel:1,//学习路径1项目2模板库3
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 1916a933..bec00e59 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -100,6 +100,7 @@
             <add-online 
             v-model:addonlineVisible="addonlinevisible" 
             @changeData="updateTableData"
+            :isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -118,7 +119,9 @@
           </div>
           <!-- 添加面授侧弹窗 -->
           <div>
-            <add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" />
+            <add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" 
+            v-model:EditEvalId="EditEvalId"
+            />
           </div>
           <!-- 添加面授侧弹窗 -->
           <div class="lin"></div>
@@ -132,8 +135,13 @@
           </div>
           <!-- 添加案例侧弹窗 -->
           <div>
-            <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
-              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+            <add-case v-model:addcaseVisible="addcasevisible"
+             @changeData="updateTableData"
+             :isLevel="isLevel"
+              v-model:edit="edit"
+              v-model:projectId="projectId" 
+              v-model:chooseStageId="chooseStageId"
+               v-model:projectTaskId="projectTaskId"
               v-model:EditCaseId="EditCaseId" />
           </div>
           <!-- 添加案例侧弹窗 -->
@@ -151,7 +159,7 @@
             <add-homework
               v-model:addhomeworkVisible="addhomeworkvisible"
               @changeData="updateTableData"
-              :isLevel="false"
+              v-model:isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -174,7 +182,7 @@
             <add-test
               v-model:addtestVisible="addtestvisible"
               @changeData="updateTableData"
-              :isLevel="false"
+              :isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -196,6 +204,7 @@
           <div>
             <add-live
               v-model:addliveVisible="addlivevisible"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -218,7 +227,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-              :isLevel="false"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -242,6 +251,7 @@
             <add-discuss
               v-model:adddiscussVisible="adddiscussvisible"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:EditDiscussId="EditDiscussId"
@@ -267,6 +277,7 @@
               v-model:EditActiveId="EditActiveId"
               v-model:projectTaskId="projectTaskId"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:chooseStageId="chooseStageId"
               @changeData="updateTableData"
             />
@@ -287,6 +298,7 @@
               v-model:addevalVisible="addevalvisible"
               @changeData="updateTableData"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
@@ -309,6 +321,7 @@
               v-model:addinvistVisible="addinvistvisible"
               @changeData="updateTableData"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
@@ -331,6 +344,7 @@
                 @changeData="updateTableData"
                 @getData="changeVData"
                 v-model:edit="edit"
+                :isLevel="isLevel"
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -879,7 +893,7 @@ import AddTest from "../../components/drawers/AddTest.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
-import AddActive from "../../components/drawers/AddActive.vue";s
+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";
@@ -953,6 +967,7 @@ export default {
         : null,
       chooseStageId: null,
       edit: false,
+      isLevel:2,//学习路径1项目2模板库3
       // isRefEdit: 1, //外链编辑
       // isLiveEdit: 1, //直播编辑
       isRefEdit: false, //外链编辑
@@ -966,6 +981,7 @@ export default {
       EditTestId: null, // 要编辑的考试id
       EditCaseId:null,//要编辑的案例id
       EditOnlineId:null,//要编辑的在线id
+      EditFaceTeach:null,
       EditEvalId: null,
       EditInvistId: null,
       EditVoteId: null, //编辑需要投票的id

From aa5ed4e7b6e9fa69c6e1968539ea0d14e0f4fb19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 09:43:21 +0800
Subject: [PATCH 48/90] =?UTF-8?q?feat=EF=BC=9A=E7=A7=BB=E5=8A=A8=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=20=E9=80=89=E6=8B=A9=E9=9D=A2=E6=8E=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexLiveBroadcast.js           |   5 +-
 src/api/indexTaskadd.js                 |  12 +
 src/components/drawers/AddDiscuss.vue   | 189 +++++++-----
 src/components/drawers/AddLive.vue      | 393 +++++++++++++-----------
 src/components/drawers/ProjectScore.vue | 286 +++++++++--------
 src/components/drawers/SelFacet.vue     | 201 +++++++-----
 src/views/projectcenter/TaskAdd.vue     | 113 +++++--
 7 files changed, 712 insertions(+), 487 deletions(-)

diff --git a/src/api/indexLiveBroadcast.js b/src/api/indexLiveBroadcast.js
index 1f5bb7a6..f855dcc0 100644
--- a/src/api/indexLiveBroadcast.js
+++ b/src/api/indexLiveBroadcast.js
@@ -22,4 +22,7 @@ export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/upd
   headers: {
     'token': '123'
   }
-})
\ No newline at end of file
+})
+
+//获取全部评估信息接口
+export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj)
\ No newline at end of file
diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index dc6a6bcb..6b01be18 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -18,3 +18,15 @@ export const editProj = (obj) => http.post('/admin/project/edit', obj)
 
 //路径图里的新建或编辑关卡任务
 export const editTask = (obj) => http.post('/admin/router/editTask', obj)
+
+//项目里获取项目积分规则
+export const scoreRule = (obj) => http.get('/admin/project/scoreRule', { params: obj })
+
+//项目里设置项目积分规则
+export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
+
+//面授课开课列表
+export const planList = (obj) => http.post('/admin/offcourse/planList', obj)
+
+//获取面授课列表
+export const list = (obj) => http.post('/admin/offcourse/list', obj)
\ No newline at end of file
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index b2166686..437ae709 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -7,8 +7,8 @@
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">        
-        <div  class="headerTitle">{{edit?'编辑':'添加'}}讨论</div>
+      <div class="header">
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}讨论</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -56,7 +56,9 @@
               <span style="margin-right: 3px">讨论设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1" @change = "checkRadio">允许评论</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
+                >允许评论</a-checkbox
+              >
             </div>
           </div>
         </div>
@@ -66,14 +68,13 @@
         <button class="btn2" @click="updateDiscussInfo">确定</button>
       </div>
     </div>
-  
   </a-drawer>
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexDiscuss";
 import * as apiTask from "../../api/indexTaskadd";
-import { RouterEditTask } from "@/api/indexTask"
+import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
 const rowSelection = ref({
   checkStrictly: false,
@@ -104,7 +105,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -120,15 +122,18 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Boolean,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
+    EditWorkId: {
+      // 要编辑的workId
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -139,84 +144,103 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
-    console.log("学习路径",props.isStudiscuss);
+    console.log("学习路径", props.isStudiscuss);
     const state = reactive({
       inputV1: "",
       inputV2: "",
       textV1: "",
       checkedC1: false,
-      discussSettings:"",
-      addLoading:false,
+      discussSettings: "",
+      addLoading: false,
     });
-    const checkRadio = () =>{
-      if(state.checkedC1){
-        state.discussSettings = "true"
-      }else{
+    const checkRadio = () => {
+      if (state.checkedC1) {
+        state.discussSettings = "true";
+      } else {
         state.discussSettings = "false";
       }
-      console.log("state.checkedC1=====",state.discussSettings,state.discussSettings=="true");
-    }
+      console.log(
+        "state.checkedC1=====",
+        state.discussSettings,
+        state.discussSettings == "true"
+      );
+    };
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
       ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.textV1 = "";
-      message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-   
+      message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+      localStorage.setItem("stageId", props.chooseStageId);
     };
-    const queryDiscuss = () =>{
-      if(props.edit){
-            //编辑讨       
-        api.getDiscussDetail({discussId:props.EditDiscussId}).then(res => {
-          console.log('获取讨论信息成功',res.data.data)
-          //更新讨论信息
-          state.inputV1 = res.data.data.discussName;
-          state.textV1 = res.data.data.discussExplain;
-          state.checkedC1 = res.data.data.discussSettings=="true"?true:false;
-          console.log("props.EditDiscussId",res.data.data.discussSettings,"===",res.data.data.discussSettings=="true",state.checkedC1)
-        }).catch(err=>{
-          console.log('获取讨论信息失败',err)
-        })
-    
-     }
+    const queryDiscuss = () => {
+      if (props.edit) {
+        //编辑讨
+        api
+          .getDiscussDetail({ discussId: props.EditDiscussId })
+          .then((res) => {
+            console.log("获取讨论信息成功", res.data.data);
+            //更新讨论信息
+            state.inputV1 = res.data.data.discussName;
+            state.textV1 = res.data.data.discussExplain;
+            state.checkedC1 =
+              res.data.data.discussSettings == "true" ? true : false;
+            console.log(
+              "props.EditDiscussId",
+              res.data.data.discussSettings,
+              "===",
+              res.data.data.discussSettings == "true",
+              state.checkedC1
+            );
+          })
+          .catch((err) => {
+            console.log("获取讨论信息失败", err);
+          });
+      }
     };
     const afterVisibleChange = (bool) => {
-      if(bool){
+      if (bool) {
         queryDiscuss();
       }
     };
     const updateTask = (res) => {
-    console.log("jinlaile ========",props.isLevel);
-        if(props.isLevel){
-          RouterEditTask({
-            chapterId:props.isactive,
-            courseId: res.data.data.discussId,
-            name: res.data.data.discussName,
-            routerId: props.routerId,
-            routerTaskId: props.routerTaskId ||0,
-            type: 8,
-          }).then(res => { 
-              console.log("新增关卡任务失败",res);
-          }).catch(err => {console.log("新增关卡任务失败",err);})
-        }else{
-        apiTask
-        .addTask({
+      console.log("jinlaile ========", props.isLevel);
+      if (props.isLevel) {
+        RouterEditTask({
+          chapterId: props.isactive,
           courseId: res.data.data.discussId,
           name: res.data.data.discussName,
-          projectId: props.projectId,
-          projectTaskId: props.projectTaskId || 0,
-          stageId:props.chooseStageId,
-          type: 8,       
-        }).then(r=>{
-          console.log("新增关卡任务成功",r);
-        }).catch(r=>{
-          console.log('更新阶段任务失败',r)
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 8,
         })
-        }
-    }
+          .then((res) => {
+            console.log("新增关卡任务失败", res);
+          })
+          .catch((err) => {
+            console.log("新增关卡任务失败", err);
+          });
+      } else {
+        apiTask
+          .addTask({
+            courseId: res.data.data.discussId,
+            name: res.data.data.discussName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 8,
+          })
+          .then((r) => {
+            console.log("新增关卡任务成功", r);
+          })
+          .catch((r) => {
+            console.log("更新阶段任务失败", r);
+          });
+      }
+    };
     const updateDiscussInfo = () => {
       if (!state.inputV1) {
         message.destroy();
@@ -226,36 +250,36 @@ export default {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明
         discussSettings: state.discussSettings, //讨论设置
-        discussId: props.edit?props.EditDiscussId:0,//讨论Id
+        discussId: props.edit ? props.EditDiscussId : 0, //讨论Id
         projectId: 0, //项目id,接口多余字段，
       };
-      console.log("dianwanle -======",String(state.checkedC1));
-      if(props.edit){
+      console.log("dianwanle -======", String(state.checkedC1));
+      if (props.edit) {
         api
           .updateDiscuss(obj)
-          .then((res)=> {
+          .then((res) => {
             updateTask(res);
             closeDrawer();
             ctx.emit("changeData", false);
-            console.log("更新成功",res);
-            console.log("项目任务ID",props.projectTaskId)
+            console.log("更新成功", res);
+            console.log("项目任务ID", props.projectTaskId);
           })
           .catch((err) => {
-              console.log("更新失败",err)
-          })
-       }else{
+            console.log("更新失败", err);
+          });
+      } else {
         api
-        .createDiscuss(obj)
-        .then((res)=> {
-          updateTask(res);
-          closeDrawer();
-          ctx.emit("changeData", false);
-          console.log("创建成功",res);
-          console.log("项目任务ID",props.projectTaskId)
-        })
-        .catch((err) => {
-          console.log("创建失败",err)
-        })
+          .createDiscuss(obj)
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+            ctx.emit("changeData", false);
+            console.log("创建成功", res);
+            console.log("项目任务ID", props.projectTaskId);
+          })
+          .catch((err) => {
+            console.log("创建失败", err);
+          });
       }
     };
     return {
@@ -392,6 +416,5 @@ export default {
       }
     }
   }
-
 }
 </style>
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 43904a80..18a2e282 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -10,7 +10,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{edit?'编辑':'添加'}}直播</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}直播</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -81,13 +81,18 @@
             </div>
             <div class="btnbox">
               <a-input-number
-                    :min="0"
-                    :max="300"
-                    :precision="0"
-                    style=" width: 364px; height: 32px; border-radius: 8px;overflow: hidden; "
-                    v-model:value="inputV2"
-                  ></a-input-number>
-            
+                :min="0"
+                :max="300"
+                :precision="0"
+                style="
+                  width: 364px;
+                  height: 32px;
+                  border-radius: 8px;
+                  overflow: hidden;
+                "
+                v-model:value="inputV2"
+              ></a-input-number>
+
               <span style="margin-left: 5px">分钟</span>
             </div>
           </div>
@@ -102,19 +107,17 @@
               <span style="margin-right: 3px">授课老师：</span>
             </div>
             <div class="btnbox">
-               
-                <a-select
-                  v-model:value="value"
-                  show-search
-                  placeholder="Select a teacher"
-                  style="width: 364px"
-                  :options="options"
-                  :filter-option="filterOption"
-                  @focus="handleFocus"
-                  @blur="handleBlur"
-                  @change="handleChange2"
-                ></a-select>
-               
+              <a-select
+                v-model:value="value"
+                show-search
+                placeholder="Select a teacher"
+                style="width: 364px"
+                :options="options"
+                :filter-option="filterOption"
+                @focus="handleFocus"
+                @blur="handleBlur"
+                @change="handleChange2"
+              ></a-select>
             </div>
           </div>
           <div class="main_item2">
@@ -122,9 +125,6 @@
               <span style="margin-right: 3px">直播封面：</span>
             </div>
             <div class="textarea" style="overflow: hidden">
-           
-            
-       
               <a-upload
                 v-model:file-list="fileList"
                 name="avatar"
@@ -135,7 +135,12 @@
                 :before-upload="beforeUpload"
                 @change="handleChange"
               >
-                <img v-if="imageUrl" :src="imageUrl" alt="avatar" style=“width：100px；height:100px;”/>
+                <img
+                  v-if="imageUrl"
+                  :src="imageUrl"
+                  alt="avatar"
+                  style="“width：100px；height:100px;”"
+                />
                 <div v-else>
                   <loading-outlined v-if="loading"></loading-outlined>
                   <plus-outlined v-else></plus-outlined>
@@ -185,23 +190,26 @@
               <span style="margin-right: 3px">评价：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1" @change = "checkRadio">需要评估</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
+                >需要评估</a-checkbox
+              >
             </div>
           </div>
-          <div class="main_item" style="margin-top: -25px," :style="{ display: checkedC1 ? 'block' : 'none' }">
+          <div
+            class="main_item"
+            style="margin-top: -25px"
+            :style="{ display: checkedC1 ? 'block' : 'none' }"
+          >
             <div class="signbox"></div>
             <div class="btnbox">
               <a-select
-                  v-model:value="value"
-                  show-search
-                  placeholder="选择评估"
-                  style="width: 364px"
-                  :options="options"
-                  :filter-option="filterOption"
-                  @focus="handleFocus"
-                  @blur="handleBlur"
-                  @change="handleChange2"
-                ></a-select>
+                v-model:value="assessmentvalue"
+                show-search
+                placeholder="选择评估"
+                style="width: 364px"
+                :options="assessment"
+                @change="handleChangeAssessment"
+              ></a-select>
             </div>
           </div>
           <div class="main_item2">
@@ -219,7 +227,12 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="width: 88px; height: 32px; border-radius: 8px;overflow: hidden; "
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     v-model:value="inputV6"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -230,7 +243,12 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="width: 88px;height: 32px;border-radius: 8px; overflow: hidden;"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     v-model:value="inputV7"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -246,7 +264,12 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style=" width: 88px;height: 32px;border-radius: 8px; overflow: hidden; "
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     v-model:value="inputV8"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
@@ -274,7 +297,9 @@
               <span style="margin-right: 3px">其他设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC2" @onclick = "checkedC2 = !checkedC2"
+              <a-checkbox
+                v-model:checked="checkedC2"
+                @onclick="checkedC2 = !checkedC2"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -295,7 +320,7 @@ import * as api from "../../api/indexLiveBroadcast";
 import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
 import { RouterEditTask } from "@/api/indexTask";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
   const reader = new FileReader();
@@ -309,7 +334,6 @@ const options1 = ref([
   },
 ]);
 
-
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -333,12 +357,13 @@ export default {
       type: Boolean,
       default: false,
     },
-  
+
     EditLiveId: {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -354,11 +379,13 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Boolean,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -369,8 +396,7 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
-  
+    },
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -396,11 +422,13 @@ export default {
       checkedC1: false,
       checkedC2: false,
       playback: false,
-      assessmentId:"0",
+      assessmentId: null,
       obj: {}, //要传的obj数据
+      assessment: [], //评估信息
+      assessmentvalue: null,
     });
     const closeDrawer = () => {
-      ctx.emit("update:addliveVisible", false); 
+      ctx.emit("update:addliveVisible", false);
       ctx.emit("update:edit", false);
       console.log(props, "props");
       state.radioV1 = "";
@@ -419,37 +447,59 @@ export default {
       state.imageUrl = "";
     };
     const afterVisibleChange = (bool) => {
-      console.log("props.edit===================", props.edit,bool);
-      if(props.edit){
+      console.log("props.edit===================", props.edit, bool);
+      if (props.edit) {
         queryLive();
-
       }
+      api
+        .queryAssessmentDetailList({
+          assessmentName: "",
+          pageNo: 1,
+          pageSize: 200,
+          releaseStatus: "",
+          searchEndTime: "",
+          searchStartTime: "",
+        })
+        .then((res) => {
+          console.log(res.data.data.rows, "获取全部评估信息");
+          res.data.data.rows.forEach((item) => {
+            let obj = item;
+            obj.value = item.assessmentId;
+            obj.label = item.assessmentName;
+            state.assessment.push(obj);
+          });
+          console.log("eeee", state.assessment);
+        });
     };
     const queryLive = () => {
-      let d =props.EditLiveId;
-      console.log("直播查询=======",d);
+      let d = props.EditLiveId;
+      console.log("直播查询=======", d);
       api
-      .getLiveBroadcastInfor({liveId:d}).then((res) => {
-       // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
-        state.inputV1 = res.data.data.liveName;
-        state.time = [dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"), dayjs(res.data.data.liveEndTime, "YYYY-MM-DD")]
-        state.inputV2= res.data.data.liveDuration;
-        state.inputV3= res.data.data. liveTeacherId;
-        //state.fileList= res.data.data
-        state.inputV4= res.data.data.liveLink;
-        state.inputV5= res.data.data.livePlaybackLink;
-        state.inputV6= res.data.data.beforeSignIn;
-        state.inputV7= res.data.data.afterSignIn;
-        state.inputV8= res.data.data.signOutTime;
-        state.textV1= res.data.data.liveExplain;
-        state.radioV1= res.data.data.standardSettings
-        //state.= res.data.data
-       
-       
-        console.log("查询成功=====inputv1",state.inputV1);
-      }).catch(() => {
-        message.error(`查询失败`)
-      })
+        .getLiveBroadcastInfor({ liveId: d })
+        .then((res) => {
+          // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+          state.inputV1 = res.data.data.liveName;
+          state.time = [
+            dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
+          ];
+          state.inputV2 = res.data.data.liveDuration;
+          state.inputV3 = res.data.data.liveTeacherId;
+          //state.fileList= res.data.data
+          state.inputV4 = res.data.data.liveLink;
+          state.inputV5 = res.data.data.livePlaybackLink;
+          state.inputV6 = res.data.data.beforeSignIn;
+          state.inputV7 = res.data.data.afterSignIn;
+          state.inputV8 = res.data.data.signOutTime;
+          state.textV1 = res.data.data.liveExplain;
+          state.radioV1 = res.data.data.standardSettings;
+          //state.= res.data.data
+          state.assessmentId = res.data.data.assessmentId;
+          console.log("查询成功=====inputv1", state.inputV1);
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
     };
 
     const cloradio1 = (value) => {
@@ -458,7 +508,7 @@ export default {
         state.radioV1 = "";
       }
     };
- 
+
     const handleChange = (info) => {
       if (info.file.status === "uploading") {
         state.loading = true;
@@ -496,48 +546,46 @@ export default {
 
       return isJpgOrPng && isLt2M;
     };
-    const updateTask =(res)=>{
-      if(props.isLevel){
-            RouterEditTask({
-              chapterId: props.isactive,
-              courseId: res.data.data.liveId,
-              duration: res.data.data.duration,
-              name: res.data.data.liveName,
-              routerId: props.routerId,
-              routerTaskId: props.routerTaskId || 0,
-              type: 6,
-            })
-              .then((res) => {
-                console.log(res, 11111);
-                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-                ctx.emit("changeData", false);
-              })
-              .catch((err) => {
-                console.log(err, 1111);
-              });
-          }else{
-            apiTask
-              .addTask({
-                courseId: res.data.data.liveId,
-                duration: res.data.data.duration,
-                name: res.data.data.liveName,
-                projectId: props.projectId,
-                projectTaskId: props.projectTaskId || 0,
-                stageId: props.chooseStageId,
-                type: 6,
-              })
-              .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-                ctx.emit("changeData", false);
-             
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-         
-          }
-    }
+    const updateTask = (res) => {
+      if (props.isLevel) {
+        RouterEditTask({
+          chapterId: props.isactive,
+          courseId: res.data.data.liveId,
+          duration: res.data.data.duration,
+          name: res.data.data.liveName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 6,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } else {
+        apiTask
+          .addTask({
+            courseId: res.data.data.liveId,
+            duration: res.data.data.duration,
+            name: res.data.data.liveName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 6,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后", res.data);
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    };
     //创建直播
     const updateLiveBroadcast = () => {
       if (!state.inputV1) {
@@ -556,8 +604,8 @@ export default {
       if (!regular.test(state.inputV2)) {
         message.destroy();
         return message.warning("直播时长需大于0");
-      }  
-  
+      }
+
       let startTime = toDate(
         new Date(state.time[0].$d).getTime() / 1000,
         "Y-M-D"
@@ -566,89 +614,85 @@ export default {
         new Date(state.time[1].$d).getTime() / 1000,
         "Y-M-D"
       );
-    
-    
+
       state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
-        assessmentId: 0,
+        assessmentId: state.assessmentId == null ? 0 : state.assessmentId,
         // liveCover: state.fileList,//直播封面
         liveDuration: state.inputV2,
         liveEndTime: endTime,
         liveStartTime: startTime,
         liveExplain: state.textV1,
         liveFlag: "",
-        liveId: props.edit?props.EditLiveId:0,
+        liveId: props.edit ? props.EditLiveId : 0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
-        livePlayback:state.playback ? "true":"false",
-        livePlaybackLink: state.playback?state.inputV5:"",
+        livePlayback: state.playback ? "true" : "false",
+        livePlaybackLink: state.playback ? state.inputV5 : "",
         liveTeacherId: state.inputV3,
-        otherSettings:0, //1或0
+        otherSettings: 0, //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
-    
       };
-     console.log("zhibo-==========",props.EditLiveId);
-      if(props.edit){
+      console.log("zhibo-==========", props.EditLiveId);
+      if (props.edit) {
         api
-        .updateLiveBroadcastMessage(state.obj)
-        .then((res) => {
-          console.log("直播编辑成功", res.data.data);
-          message.success("提交成功");
-          updateTask(res);
-          closeDrawer();              
-        })
-        .catch((err) => {
-          console.log(err, 2222);
-        });
-      }else{
+          .updateLiveBroadcastMessage(state.obj)
+          .then((res) => {
+            console.log("直播编辑成功", res.data.data);
+            message.success("提交成功");
+            updateTask(res);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 2222);
+          });
+      } else {
         api
-        .createLiveBroadcast(state.obj)
-        .then((res) => {
-          console.log("调用添加直播接口后", res.data.data);
-          // console.log(state, 2222);
-          message.success("提交成功");
-          updateTask(res);
-          closeDrawer();   
-        })
-        .catch((err) => {
-          console.log(err, 2222);
-        });
+          .createLiveBroadcast(state.obj)
+          .then((res) => {
+            console.log("调用添加直播接口后", res.data.data);
+            // console.log(state, 2222);
+            message.success("提交成功");
+            updateTask(res);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 2222);
+          });
       }
-    
     };
 
-    const options = ref([{
-      value: 'jack',
-      label: 'Jack',
-    }, {
-      value: 'lucy',
-      label: 'Lucy',
-    }, {
-      value: 'tom',
-      label: 'Tom',
-    }]);
-    const handleChange2 = value => {
+    const options = ref([]);
+    const handleChange2 = (value) => {
       console.log(`selected ${value}`);
     };
     const handleBlur = () => {
-      console.log('blur');
+      console.log("blur");
     };
     const handleFocus = () => {
-      console.log('focus');
+      console.log("focus");
     };
-    const checkRadio = () =>{
-      if(state.checkedC1){
-        state.discussSettings = "true"
-      }else{
+    const checkRadio = () => {
+      if (state.checkedC1) {
+        state.discussSettings = "true";
+      } else {
         state.discussSettings = "false";
       }
-      console.log("state.checkedC1=====",state.discussSettings,state.discussSettings=="true");
-    }
+      console.log(
+        "state.checkedC1=====",
+        state.discussSettings,
+        state.discussSettings == "true"
+      );
+    };
     const filterOption = (input, option) => {
       return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
     };
+    const handleChangeAssessment = (value, option) => {
+      console.log("选择了", value, option);
+      state.assessmentId = option.assessmentId;
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -666,6 +710,7 @@ export default {
       handleChange2,
       options,
       checkRadio,
+      handleChangeAssessment,
     };
   },
 };
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 9a590d99..67e313a3 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -52,19 +52,19 @@
           <div class="grouprightscore">
             <div class="sbutton" @click="typeChange(1)">
               <img
-                v-if="stuValue===2"
+                v-if="stuValue === 2"
                 src="../../assets/images/taskpage/stu0.png"
               />
               <img v-else src="../../assets/images/taskpage/stu.png" />
-              <div :class="stuValue===2 ? '' : 'btn1'">学员积分榜</div>
+              <div :class="stuValue === 2 ? '' : 'btn1'">学员积分榜</div>
             </div>
             <div class="sbutton" @click="typeChange(2)">
               <img
-                v-if="stuValue===2"
+                v-if="stuValue === 2"
                 src="../../assets/images/taskpage/group.png"
               />
               <img v-else src="../../assets/images/taskpage/group0.png" />
-              <div :class="stuValue===2 ? 'btn1' : ''">小组积分榜</div>
+              <div :class="stuValue === 2 ? 'btn1' : ''">小组积分榜</div>
             </div>
           </div>
           <div class="group" style="justify-content: center">
@@ -101,7 +101,7 @@
           </div>
           <div class="listdiv">
             <div class="slist">
-              <a-list :data-source="stuValue ===1? datascoreg : datascore">
+              <a-list :data-source="stuValue === 1 ? datascoreg : datascore">
                 <template #renderItem="{ item }">
                   <div class="item">
                     <div v-if="item.id == 1" class="itemleft">
@@ -141,13 +141,13 @@
             <div class="groupright">
               <div class="spandiv"><span class="spantext">规则</span></div>
               <div v-if="edit" class="btns">
-                <div class="btn1" @click="edit = !edit">
+                <div class="btn1" @click="edit = false">
                   <img src="../../assets/images/projectadd/edit1.png" />
                   <span class="btn1text">编辑</span>
                 </div>
               </div>
               <div v-else class="btns">
-                <div class="btn1" @click="edit = !edit">
+                <div class="btn1" @click="editRule">
                   <span class="btn1text">保存</span>
                 </div>
               </div>
@@ -164,48 +164,37 @@
                 ><span class="scoretext">{{ score1 }} </span><span>积分</span>
               </div>
               <div class="content">
-                <span>完成在线课程获得 </span
-                ><span class="scoretext">{{ done }}</span
-                ><span style="margin-right:50px">积分</span>
-                <span>完成面授课程获得 </span
-                ><span class="scoretext">{{ done1 }}</span
-                ><span style="margin-right:50px">积分</span>
                 <span>完成作业成绩不低于 </span
                 ><span class="scoretext">{{ done2 }}</span
-                ><span>分获得</span>
-                <span class="scoretext">{{ done3 }}</span
+                ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
                 ><span>积分</span>
               </div>
               <div class="content">
-                <span>前</span
-                ><span class="scoretext">{{ four1}}</span
+                <span>前</span><span class="scoretext">{{ four1 }}</span
                 ><span>名学完在线课程获得</span>
-                <span class="scoretext">{{ four2}}</span
-                ><span style="margin-right:50px">积分</span>
-                <span>前</span
-                ><span class="scoretext">{{ four3}}</span
+                <span class="scoretext">{{ four2 }}</span
+                ><span style="margin-right: 50px">积分</span> <span>前</span
+                ><span class="scoretext">{{ four3 }}</span
                 ><span>名提交作业且成绩不低于</span>
-                <span class="scoretext">{{ four4}}</span
-                ><span >分获得</span>
-                <span class="scoretext">{{ four5}}</span
+                <span class="scoretext">{{ four4 }}</span
+                ><span>分获得</span> <span class="scoretext">{{ four5 }}</span
                 ><span>积分</span>
               </div>
               <div class="content">
                 <span>考试成绩高于</span
                 ><span class="scoretext">{{ five1 }}</span
-                ><span>分获得</span>
-                <span class="scoretext">{{ five2 }}</span
+                ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
                 ><span>积分</span>
               </div>
               <div class="content">
                 <span>考勤正常学员获得 </span
-                ><span class="scoretext">{{ six1}}</span
+                ><span class="scoretext">{{ six1 }}</span
                 ><span>积分</span>
               </div>
               <div class="content">
                 <span>成为小组长获得</span
                 ><span class="scoretext">{{ seven1 }}</span
-                ><span style="margin-right:50px">积分</span>
+                ><span style="margin-right: 50px">积分</span>
                 <span>优秀学员可获得</span>
                 <span class="scoretext">{{ seven2 }}</span
                 ><span>积分</span>
@@ -228,82 +217,60 @@
                 ><span>积分</span>
               </div>
               <div class="content">
-                <span>完成在线课程获得 </span
-                ><span
-                  ><a-input v-model:value="done" :bordered="false" /></span
-                ><span style="margin-right:50px">积分</span>
-                <span>完成面授课程获得 </span
-                ><a-input
-                    v-model:value="done1"
-                    :bordered="false"
-                  />
-                  <span style="margin-right:50px">积分</span>
-                  <span>完成作业成绩不低于 </span
-                ><a-input
-                    v-model:value="done2"
-                    :bordered="false"
-                  /><span>分获得</span>
-                  <a-input
-                    v-model:value="done3"
-                    :bordered="false"
-                  /><span>积分</span>
+                <span>完成作业成绩不低于 </span
+                ><a-input v-model:value="done2" :bordered="false" /><span
+                  >分获得</span
+                >
+                <a-input v-model:value="done3" :bordered="false" /><span
+                  >积分</span
+                >
               </div>
               <div class="content">
                 <span>前</span
-                ><a-input
-                    v-model:value="four1"
-                    :bordered="false"
-                  /><span>名学完在线课程获得</span>
-                  <a-input
-                    v-model:value="four2"
-                    :bordered="false"
-                  /><span style="margin-right:50px">积分</span>
+                ><a-input v-model:value="four1" :bordered="false" /><span
+                  >名学完在线课程获得</span
+                >
+                <a-input v-model:value="four2" :bordered="false" /><span
+                  style="margin-right: 50px"
+                  >积分</span
+                >
                 <span>前</span
-                ><a-input
-                    v-model:value="four3"
-                    :bordered="false"
-                  /><span>名提交作业且成绩不低于</span>
-                  <a-input
-                    v-model:value="four4"
-                    :bordered="false"
-                  /><span >分获得</span>
-                  <a-input
-                    v-model:value="four5"
-                    :bordered="false"
-                  /><span>积分</span>
-
+                ><a-input v-model:value="four3" :bordered="false" /><span
+                  >名提交作业且成绩不低于</span
+                >
+                <a-input v-model:value="four4" :bordered="false" /><span
+                  >分获得</span
+                >
+                <a-input v-model:value="four5" :bordered="false" /><span
+                  >积分</span
+                >
               </div>
               <div class="content">
                 <span>考试成绩高于</span
-                ><a-input
-                    v-model:value="five1"
-                    :bordered="false"
-                  /><span>分获得</span>
-                  <a-input
-                    v-model:value="five2"
-                    :bordered="false"
-                  /><span>积分</span>
+                ><a-input v-model:value="five1" :bordered="false" /><span
+                  >分获得</span
+                >
+                <a-input v-model:value="five2" :bordered="false" /><span
+                  >积分</span
+                >
               </div>
               <div class="content">
                 <span>考勤正常学员获得 </span
-                ><a-input
-                    v-model:value="six1"
-                    :bordered="false"
-                  /><span>积分</span>
+                ><a-input v-model:value="six1" :bordered="false" /><span
+                  >积分</span
+                >
               </div>
               <div class="content">
                 <span>成为小组长获得</span
-                ><a-input
-                    v-model:value="seven1"
-                    :bordered="false"
-                  /><span style="margin-right:50px">积分</span>
+                ><a-input v-model:value="seven1" :bordered="false" /><span
+                  style="margin-right: 50px"
+                  >积分</span
+                >
                 <span>优秀学员可获得</span>
-                <a-input
-                    v-model:value="seven2"
-                    :bordered="false"
-                  /><span>积分</span>
+                <a-input v-model:value="seven2" :bordered="false" /><span
+                  >积分</span
+                >
               </div>
-              
             </div>
           </div>
         </div></a-tab-pane
@@ -315,8 +282,11 @@
 
 <script>
 import StuScoreDetail from "../../components/drawers/StuScoreDetail";
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, computed } from "vue";
 import * as api from "../../api/index1";
+// import { message } from "ant-design-vue";
+// import { scoreRule } from "../../api/indexTaskadd"; //获取项目积分规则
+import { setScoreRule } from "../../api/indexTaskadd"; //设置项目积分规则
 export default {
   name: "ProjectScore",
   components: {
@@ -483,24 +453,21 @@ export default {
       tableDataTotal: 30,
       stuValue: false,
       Svisible: false,
-      score1: 5,
-      score2: 5,
-      done:null,
-      done1:null,
-      done2:null,
-      done3:null,
-      four1:null,
-      four2:null,
-      four3:null,
-      four4:null,
-      four5:null,
-      five1:null,
-      five2:null,
-      six1:null,
-      seven1:null,
-      seven2:null,
+      score1: null,
+      done2: null,
+      done3: null,
+      four1: null,
+      four2: null,
+      four3: null,
+      four4: null,
+      four5: null,
+      five1: null,
+      five2: null,
+      six1: null,
+      seven1: null,
+      seven2: null,
       edit: true,
-      searchRankName:null,//榜单搜索名称
+      searchRankName: null, //榜单搜索名称
     });
     const getTableData = () => {
       let datas = state.tabledataStu;
@@ -523,6 +490,23 @@ export default {
       });
       state.tabledataStu = datas;
     };
+    const scoresum = computed(() => {
+      // console.log(Object.prototype.toString.call(Number(state.score1)));
+      // if (Object.prototype.toString.call(state.score1) !== "[object Number]") {
+      //   message.destroy();
+      //   return message.warning("请输入合法数字");
+      // }
+      return (
+        Number(state.score1) +
+        Number(state.done3) +
+        Number(state.four2) +
+        Number(state.four5) +
+        Number(state.five2) +
+        Number(state.six1) +
+        Number(state.seven1) +
+        Number(state.seven2)
+      );
+    });
     getTableData();
 
     const tabsChange = (e) => {
@@ -530,30 +514,29 @@ export default {
         // console.log('获取项目积分-榜单')
         scoreRank(1, 1);
       }
-      rankReset()
-      state.todayvalue='1'
-      state.stuValue=1
+      rankReset();
+      state.todayvalue = "1";
+      state.stuValue = 1;
     };
-   
-   
+
     //重置
-    const rankReset=()=>{
-        state.searchRankName=null  
-    }
+    const rankReset = () => {
+      state.searchRankName = null;
+    };
     // start -------榜单---------------榜单------------榜单------------------榜单---------
     //学员积分还是小组积分
-     const typeChange = (num) => {
+    const typeChange = (num) => {
       state.stuValue = num;
-      scoreRank(state.stuValue , state.todayvalue);
+      scoreRank(state.stuValue, state.todayvalue);
     };
     //选择时间
     const changeday = (e) => {
       state.todayvalue = e.target.value;
-      scoreRank(state.stuValue , state.todayvalue);
+      scoreRank(state.stuValue, state.todayvalue);
     };
-     //搜索
+    //搜索
     const searchRank = () => {
-     scoreRank(state.stuValue , state.todayvalue)
+      scoreRank(state.stuValue, state.todayvalue);
     };
     //项目积分榜单
     const scoreRank = (period, type) => {
@@ -576,6 +559,46 @@ export default {
         });
     };
     // end -----榜单----------------榜单----------------------榜单-----------榜单----------
+    const editRule = () => {
+      console.log(props.projectId);
+      let obj = {
+        courseScore: state.score1,
+        examItem: {
+          numLimit: 0,
+          score: state.five2,
+          scoreLimit: state.five1,
+        },
+        //有名次要求的提交作业
+        homeworkItem: {
+          numLimit: state.four3,
+          score: state.four5,
+          scoreLimit: state.four4,
+        },
+        leaderScore: state.seven1,
+        projectId: props.projectId,
+        signScore: state.six1,
+        topCompleteCourseItem: {
+          numLimit: state.four1,
+          score: state.four2,
+          scoreLimit: 0,
+        },
+        topStudentScore: state.seven2,
+        totalScore: scoresum.value,
+      };
+      console.log(obj);
+      setScoreRule(obj)
+        .then((res) => {
+          console.log(res.data, "修改成功");
+        })
+        .catch((err) => {
+          console.log(err.data);
+        });
+      // scoreRule({
+      //   projectId: props.projectId,
+      // });
+
+      state.edit = true;
+    };
     return {
       ...toRefs(state),
       typeChange,
@@ -584,14 +607,25 @@ export default {
       rankReset,
       tabsChange,
       scoreRank,
+      editRule,
+      scoresum,
     };
   },
-  computed: {
-    // 计算属性的 getter
-    scoresum: function () {
-      return Number(this.score1) + Number(this.score2);
-    },
-  },
+  // computed: {
+  //   // 计算属性的 getter
+  //   scoresum: function () {
+  //     return (
+  //       Number(this.score1) +
+  //       Number(this.done3) +
+  //       Number(this.four2) +
+  //       Number(this.four5) +
+  //       Number(this.five2) +
+  //       Number(this.six1) +
+  //       Number(this.seven1) +
+  //       Number(this.seven2)
+  //     );
+  //   },
+  // },
 };
 </script>
 <style lang="scss">
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index d6d6799f..dc442258 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -23,7 +23,7 @@
               <div class="ipt_name">课程编号：</div>
               <div class="fi_input">
                 <a-input
-                  v-model:value="value"
+                  v-model:value="valueClass"
                   style="width: 240px; height: 40px; border-radius: 8px"
                   placeholder="请输入项目名称"
                 />
@@ -37,6 +37,8 @@
                   style="width: 240px"
                   placeholder="请选择"
                   :options="options1"
+                  @change="handleChange"
+                  v-model:value="valueContent"
                   allowClear
                   showSearch
                 />
@@ -44,11 +46,11 @@
             </div>
           </div>
           <div class="mi_btns">
-            <div class="btn btn1">
+            <div class="btn btn1" @click="search">
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="reset">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -63,28 +65,23 @@
             "
             :row-selection="rowSelection"
             :columns="columns1"
-            :data-source="tableData1"
+            :data-source="classTableData"
             :loading="tableDataTotal === -1 ? true : false"
-            :pagination="{
-              showSizeChanger: true,
-              showQuickJumper: true,
-              hideOnSinglePage: true,
-              pageSizeOptions: [],
-              pageSize: pageSize,
-              current: currentPage,
-              total: tableDataTotal,
-              onChange: (page, pageSize) => {
-                currentPage = page;
-                // console.log('page', page)
-                // 加翻页查找代码
-                // 	this.setState({
-                // 		currentPage: page,
-                // 	}, () => {
-                // 		this.getMilitaryDeployment()
-                // 	})
-              },
-            }"
+            :pagination="false"
           />
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="changePaginationStu"
+            />
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -96,10 +93,17 @@
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
+// import { planList } from "../../api/indexTaskadd";
+import { list } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
 const options1 = ref([
   {
     value: "value1",
-    label: "请选择状态",
+    label: "通用",
+  },
+  {
+    value: "value2",
+    label: "领导",
   },
 ]);
 const columns1 = [
@@ -172,7 +176,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      tableData1: [
+      classTableData: [
         {
           key: "1",
           num: "JDF2022071100001",
@@ -185,8 +189,8 @@ export default {
         {
           key: "2",
           num: "JDF2022071100001",
-          name: "管理能力课程",
-          content: "领导力",
+          name: "时间管理课程",
+          content: "通用力",
           teacher: "BOE教师",
           creator: "管理员",
           time: "2022-10-31 23:12:00",
@@ -194,7 +198,7 @@ export default {
         {
           key: "3",
           num: "JDF2022071100001",
-          name: "快速换模SMED",
+          name: "时间管理课程",
           content: "通用力",
           teacher: "BOE教师",
           creator: "管理员",
@@ -203,80 +207,119 @@ export default {
         {
           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: "领导力",
+          content: "通用力",
           teacher: "BOE教师",
           creator: "管理员",
           time: "2022-10-31 23:12:00",
         },
       ],
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: null,
       pageSize: 10,
-      value:'',
+      valueClass: null, //课程编号
+      valueContent: null, //内容分类
     });
     const closeDrawer = () => {
       ctx.emit("update:selfacetVisible", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      getClassList();
     };
-    const showDrawerSelFacet = () => {
-      state.selfacetvisible = true;
+    // const showDrawerSelFacet = () => {
+    //   state.selfacetvisible = true;
+    // };
+    //获取面授课列表
+    const getClassList = (obj) => {
+      let objn = obj || {
+        auditStatus: 0,
+        beginTime: 0,
+        categoryId: 0,
+        createName: "",
+        endTime: 0,
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectName: "",
+      };
+      list(objn)
+        .then((res) => {
+          console.log(res.data.data.rows);
+          let result = res.data.data;
+          state.tableDataTotal = result.total;
+          if (result.total > 0) {
+            getClassData(result.rows);
+          }
+        })
+        .catch((err) => {
+          console.log("获取列表失败", err.data);
+        });
+    };
+
+    const getClassData = (tabledata) => {
+      let data = tabledata;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          key: value.offcourseId,
+          num: value.offcourseId,
+          name: value.name,
+          teacher: value.teacher,
+          creator: value.teacher,
+          time: toDate(value.publishTime / 1000, "Y-M-D"),
+          categoryId: value.categoryId,
+          //需要判断content
+        };
+        array.push(obj);
+      });
+      state.classTableData = array;
+    };
+
+    const handleChange = (value, option) => {
+      console.log("改变了", value, option);
+      console.log(state.valueContent);
+    };
+    //重置
+    const reset = () => {
+      state.valueClass = null;
+      state.valueContent = null;
+      //重新获取列表
+      getClassList();
+    };
+    //搜索
+    const search = () => {
+      let obj = {
+        auditStatus: 0,
+        beginTime: 0,
+        categoryId: 0, //分类
+        createName: "",
+        endTime: 0,
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectName: "",
+      };
+      getClassList(obj);
+    };
+    const changePaginationStu = (page) => {
+      state.currentPage = page;
+      getClassList();
     };
     return {
       ...toRefs(state),
-      showDrawerSelFacet,
+      // showDrawerSelFacet,
       afterVisibleChange,
       closeDrawer,
       options1,
       columns1,
       rowSelection,
+      getClassData,
+      handleChange,
+      reset,
+      getClassList,
+      search,
+      changePaginationStu,
       // change,
     };
   },
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 9607571d..c7c865c0 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -841,16 +841,28 @@
               <a-select
                 v-model:value="curLevel"
                 style="width: 100%"
-                placeholder="请选择关卡"
-                :options="projectNameList4"
-                @change="selectProjectName4"
+                placeholder="请选择阶段"
+                :options="level"
+                @change="handleChangeStage"
                 allowClear
                 showSearch
               ></a-select>
             </div>
             <div class="btn">
-              <button class="sameb btn1" @click="closeChangeModal">取消</button>
-              <button class="sameb btn2" @click="moveTask">确定</button>
+              <button
+                style="cursor: pointer"
+                class="sameb btn1"
+                @click="closeChangeModal"
+              >
+                取消
+              </button>
+              <button
+                style="cursor: pointer"
+                class="sameb btn2"
+                @click="moveTask"
+              >
+                确定
+              </button>
             </div>
           </div>
         </div>
@@ -943,6 +955,7 @@ export default {
         ? JSON.parse(storage.get("projectId"))
         : null,
       chooseStageId: null,
+      removeStageId: null,
       edit: false,
       // isRefEdit: 1, //外链编辑
       // isLiveEdit: 1, //直播编辑
@@ -1211,6 +1224,8 @@ export default {
           tit: value.name,
           name: value.remark,
           taskList: value.taskList,
+          value: value.name,
+          label: value.name,
         };
         array.push(obj);
       });
@@ -1360,8 +1375,27 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
+              // let stage = localStorage.getItem("stageId")
+              //   ? localStorage.getItem("stageId")
+              //   : null;
+              // if (stage !== null) {
+              //   // console.log("找到了origin", originStageList);
+              //   let originStageList = res.data.data.stageList.find((item) => {
+              //     item.stageId == stage;
+              //   });
+              //   getTableData(originStageList.taskList);
+              //   console.log("找到了origin", originStageList);
+              // } else {
+              //   let arr = res.data.data.stageList[0].taskList;
+              //   console.log("任务列表", arr);
+              //   getTableData(arr);
+              // }
+
+              let stage = localStorage.getItem("stageId")
+                ? localStorage.getItem("stageId")
+                : null;
               let arr = res.data.data.stageList[0].taskList;
-              console.log("任务列表", arr);
+              console.log("任务列表", stage, arr);
               getTableData(arr);
             }
 
@@ -1376,8 +1410,15 @@ export default {
               });
             }
             //给阶段id赋初始值
-            state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
-            console.log(state.chooseStageId, 1111);
+            let stage = localStorage.getItem("stageId")
+              ? localStorage.getItem("stageId")
+              : null;
+            if (stage !== null) {
+              state.chooseStageId = stage;
+            } else {
+              state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
+              console.log(state.chooseStageId, 1111);
+            }
           }
         })
         .catch((err) => {
@@ -1412,28 +1453,47 @@ export default {
     };
 
     const showChangeModal = () => {
-      state.visiblene = true;
+      if (state.selectRow.length == 0) {
+        message.destroy();
+        return message.warning("请选择要移动的任务");
+      } else {
+        state.visiblene = true;
+      }
     };
     const closeChangeModal = () => {
       state.visiblene = false;
     };
     //移动任务到阶段
     const moveTask = () => {
-      let obj = {
-        stageId: state.chooseStageId,
-        projectTaskId: state.selectRow,
-      };
-      apimove
-        .moveTask(obj)
-        .then((res) => {
-          console.log("移动成功", res);
-          message.destroy();
-          message.success("移动成功");
-          getTask();
-        })
-        .catch((err) => {
-          console.log("移动失败", err);
-        });
+      if (state.chooseStageId == state.removeStageId) {
+        console.log("buneng");
+        message.destroy();
+        message.warning("选择的任务已在当前阶段");
+      } else if (state.removeStageId == null) {
+        message.destroy();
+        message.warning("请选择阶段");
+      } else {
+        {
+          let obj = {
+            stageId: state.removeStageId,
+            projectTaskId: state.selectRow,
+          };
+          apimove
+            .moveTask(obj)
+            .then((res) => {
+              console.log("移动成功", res);
+              message.destroy();
+              message.success("移动成功");
+              console.log(state.removeStageId);
+              getTask();
+              localStorage.setItem("stageId", state.chooseStageId);
+            })
+            .catch((err) => {
+              console.log("移动失败", err);
+            });
+          state.visiblene = false;
+        }
+      }
     };
     //批量删除
     const deleteTaskAll = () => {
@@ -1715,6 +1775,10 @@ export default {
     const closeDeAll = () => {
       state.deAll = false;
     };
+    const handleChangeStage = (value, option) => {
+      console.log("阶段改变", value, option);
+      state.removeStageId = option.id;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1764,6 +1828,7 @@ export default {
       decideType,
       showdeAll,
       closeDeAll,
+      handleChangeStage,
     };
   },
 };

From 96544ab02b562b914b43433f913c5f3e04ea614d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Wed, 16 Nov 2022 10:43:34 +0800
Subject: [PATCH 49/90] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F/=E5=86=85=E9=83=A8=E8=80=83=E8=AF=95,=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=85=AC=E5=91=8A,=E9=98=B6=E6=AE=B5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexTemplate.js                    |  17 ++
 src/components/drawers/AddTest.vue          |   8 +
 src/views/projectcenter/LibraryAdd.vue      | 287 ++++++++++++++++++--
 src/views/projectcenter/TemplateLibrary.vue |   2 +-
 4 files changed, 289 insertions(+), 25 deletions(-)
 create mode 100644 src/api/indexTemplate.js

diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js
new file mode 100644
index 00000000..713e349a
--- /dev/null
+++ b/src/api/indexTemplate.js
@@ -0,0 +1,17 @@
+// 模板相关接口
+import http from "./config";
+
+//编辑项目模板
+export const templateEdit = (obj) => http.post('/admin/project/template/edit',obj);
+// 模板详情
+export const templateDetail = (id) => http.get(`/admin/project/template/edit?projectTemplateId=${id}`);
+// 删除阶段
+export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id});
+//删除任务
+export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask`,{projectTaskIds:id}); 
+// 移动任务到阶段
+export const moveTask = (obj) => http.post('/admin/project/template/moveTask',obj);
+// 新建或编辑阶段
+export const editStage = (obj) => http.post('/admin/project/template/editStage',obj);
+// 新建或编辑阶段任务
+export const editTask = (obj) => http.post('/admin/project/template/editTask',obj);
\ No newline at end of file
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index c04ab2be..fbd6c832 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -15,6 +15,13 @@
           @click="closeDrawer"
         />
       </div>
+      <div style="display: flex; flex-direction: row">
+        <a-button style="width:100px;"
+        @click="()=>{isOuter = 1}"
+         :class="[isOuter == 1? 'outer' : '' ]">系统考试</a-button>
+      <a-button style="width:100px;" @click="()=>{isOuter = 2}"
+       :class="[isOuter == 2? 'outer' : '' ]" >外部考试</a-button>
+      </div>
       <a-form
             ref="formRef"
             name="custom-validation"
@@ -270,6 +277,7 @@ export default {
     });
     const state = reactive({
       addLoading: false,
+      isOuter:1, // 是否为外部考试
     })
     const formRef = ref();
     let checkExaminationName = async (_rule, value) => {
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index eb1b0eb1..87f27829 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -200,7 +200,7 @@
                               : 'none',
                         }"
                       >
-                        <!-- 考勤 -->
+                      考勤
                       </div>
                       <div
                         class="operation"
@@ -214,7 +214,7 @@
                               : 'none',
                         }"
                       >
-                        <!-- 二维码 -->
+                        二维码
                       </div>
                       <div
                         class="operation"
@@ -238,7 +238,7 @@
                             : null
                         "
                       >
-                        <!-- 管理 -->
+                        管理
                       </div>
                     </div>
                   </div>
@@ -308,7 +308,7 @@
                     <div>&nbsp;</div>
                     <div class="area_btn">
                       <div class="pub"></div>
-                      <div class="btnText">发布</div>
+                      <div class="btnText" @click="addNotice">发布</div>
                     </div>
                   </div>
                 </div>
@@ -388,51 +388,78 @@
           <div class="setting">
             <div class="set_tit">
               <span>基本信息</span>
+              <span class="editBtn" @click="() => {isEdit=true}">编辑</span>
             </div>
             <hr color="#E8E8E8" />
             <div class="set_body">
               <div class="set_content">
-                <div class="setc_name"><span>项目名称：</span></div>
+                <div class="setc_name"><span>模板名称：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">管理者进阶 - 管理者腾飞班</span>
+                  <a-input v-model:value="formData.name"
+                  :bordered="isEdit" :disabled="!isEdit"
+                  style="width:300px;"
+                  ></a-input>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>封面图：</span></div>
                 <div class="setc_main">
-                  <img src="@/assets/images/projectadd/picture.png" alt="" />
+                  <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                  :disabled="!isEdit"
+                >
+                <img src="@/assets/images/projectadd/picture.png" alt="" />
+                </a-upload>
+                  
                 </div>
               </div>
               <div class="set_content">
-                <div class="setc_name"><span>项目时间：</span></div>
+                <div class="setc_name"><span>模板时间：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999"
-                    >2022-7-16 12:30 ～ 2022-7-30 12:30</span
-                  >
+                  <a-range-picker v-model:value="formData.time"
+                  
+                  :bordered="isEdit" :disabled="!isEdit" />
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>项目经理：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">张雪</span>
+                  <a-select
+                    v-model:value="formData.manager" mode="multiple"
+                    placeholder="请选择项目经理"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="managerOptions"
+                  ></a-select>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>资源归属：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <a-select
+                    v-model:value="formData.sourceBelongId"
+                    placeholder="请选择资源归属"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="sourceBelongOptions"
+                  ></a-select>
                 </div>
               </div>
               <div class="set_content">
-                <div class="setc_name"><span>项目说明：</span></div>
+                <div class="setc_name"><span>模板说明：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <a-input v-model:value="formData.remark"
+                  style="width:300px;"
+                  :bordered="isEdit" :disabled="!isEdit"
+                  ></a-input>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>同步学习记录：</span></div>
                 <div class="setc_main" @click="changecheck2">
-                  <a-radio v-model:checked="checked2"
+                  <a-radio v-model:checked="formData.courseSyncFlag"
+                  :bordered="isEdit" :disabled="!isEdit"
                     ><span style="color: #333333"
                       >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                     ></a-radio
@@ -442,23 +469,38 @@
               <div class="set_content">
                 <div class="setc_name"><span>项目级别：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <a-select
+                    v-model:value="formData.level"
+                    placeholder="请选择项目级别"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="levelOptions"
+                  ></a-select>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>培训体系：</span></div>
                 <div class="setc_main">
-                  <span style="color: #999999">-</span>
+                  <a-select
+                    v-model:value="formData.systemId"
+                    placeholder="请选择培训体系"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="systemOptions"
+                  ></a-select>
                 </div>
               </div>
               <div class="set_content">
                 <div class="setc_name"><span>是否BOEU实施：</span></div>
                 <div class="setc_main" @click="changecheck3">
-                  <a-radio v-model:checked="checked3"
+                  <a-radio v-model:checked="formData.boeFlag"
+                  :bordered="isEdit" :disabled="!isEdit"
                     ><span style="color: #333333">BOEU实施</span></a-radio
                   >
                 </div>
               </div>
+              <div  v-if="isEdit" style="transform: translateX(50%)">
+                <a-button @click="cancelEdit" style="background-color: #f9f9f9">取消</a-button>
+                <a-button  @click="confirmEdit" style="background-color: #f5faff">保存</a-button>
+            </div>
             </div>
           </div>
             </a-tab-pane>
@@ -467,7 +509,7 @@
               <div class="Gcon">
                 <div class="pad"></div>
                 <div class="Gin">
-                  <div class="headone">
+                  <div class="headone" style="transform: translateX(30px)">
                     <div class="box"></div>
                     <div class="onetitle">上传共享文档</div>
                     <div class="oneedi">
@@ -548,7 +590,9 @@
 </template>
 
 <script>
-import { ref, reactive, defineComponent, toRefs } from "vue";
+import { ref, reactive, defineComponent, toRefs, onMounted} from "vue";
+import { message } from "ant-design-vue";
+import * as api from "@/api/indexTemplate"
 export default defineComponent({
   name: "LibraryAdd",
   setup() {
@@ -674,6 +718,29 @@ export default defineComponent({
           ],
         },
       ],
+      // 模板编辑列表
+      managerOptions:[
+        { value: "李俊国"},
+        { value: "将小米"},
+        { value: "刘孟君"},
+      ],
+      sourceBelongOptions:[
+        { value: "项目一"},
+        { value: "项目二"},
+        { value: "项目三"},
+      ],
+      levelOptions:[
+        { value: "集团级"},
+        { value: "组织级"},
+        { value: "现地级"},
+        { value: "部门级"},
+      ],
+      systemOptions:[
+        { value: "集团级"},
+        { value: "组织级"},
+        { value: "现地级"},
+        { value: "部门级"},
+      ],
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
       showTimeText: "",
@@ -681,13 +748,13 @@ export default defineComponent({
       showTestText: "",
       activeKey: ref("1"),
       // value: ref(" "),
-      checked: false,
+      checked: true,
       checked2: false,
       checked3: false,
       docChecked:true,
       value3: false,
       value4: false,
-      hideshow: false,
+      hideshow: true,
       score1: 5,
       score2: 5,
       edit: true,
@@ -705,7 +772,20 @@ export default defineComponent({
           name:'测试文档3.doc',
           src:"",
         }
-      ], 
+      ],
+      // 基本信息
+      formData:{
+        name: "123",
+        time: "",
+        manager: "建国",
+        sourceBelongId: null,
+        remark: "",
+        courseSyncFlag: false,
+        level: null,
+        systemId: null,
+        boeFlag: false,
+      },
+      isEdit:false, // 是否处于编辑状态
     });
     const value = ref("");
     const value2 = ref("");
@@ -719,6 +799,151 @@ export default defineComponent({
     const changecheck3 = () => {
       state.checked3 = !state.checked3;
     };
+    const cancelEdit = () => {
+      state.isEdit = false;
+      getDetail();
+    };
+    const confirmEdit = () => {
+      state.isEdit = false;
+      editTemplate()
+      getDetail();
+    };
+    onMounted(() => {getDetail()});
+    // 获取详情
+    const getDetail = () => {
+      api.templateDetail(0).then(res => {
+        console.log(res)
+        state.formData.name = res.data.data.projectInfo.name
+        state.formData.time = res.data.data.projectInfo.startTime+res.data.data.projectInfo.endTime;
+        state.formData.manager = res.data.data.projectInfo.manager
+        state.formData.sourceBelongId = res.data.data.projectInfo.sourceBelongId
+        state.formData.remark = res.data.data.stageList.remark
+        state.formData.courseSyncFlag = res.data.data.projectInfo.courseSyncFlag
+        state.formData.level = res.data.data.projectInfo.level
+        state.formData.systemId = res.data.data.projectInfo.systemId
+        state.formData.boeFlag = res.data.data.projectInfo.boeFlag
+        state.value2 = res.data.data.projectInfo.notice
+      }).catch(err => {
+        message.error("操作失败"+err)
+        console.log(err)
+      })
+    }
+    // 编辑项目模板
+    const editTemplate = () => {
+      let obj = {
+        "beginTime": state.formData.time,
+        "boeFlag": state.formData.boeFlag,
+        "category": 0,
+        "courseSyncFlag": state.formData.courseSyncFlag,
+        "endTime": state.formData.time,
+        "level": state.formData.level,
+        "manager": state.formData.manager,
+        "managerId": "",
+        "name": state.formData.name,
+        "notice": "",
+        "noticeFlag": 0,
+        "picUrl": "",
+        "projectTemplateId": 0,
+        "remark": state.formData.remark,
+        "sourceBelongId": state.formData.sourceBelongId,
+        "status": 0,
+        "systemId": state.formData.systemId
+      };
+      api.templateEdit(obj).methods(obj).then(res => {
+        message.success("编辑成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑失败"+err)
+        console.log(err)
+      })
+    }
+    // 发布公告
+    const addNotice = () => {
+      let obj = {
+        "beginTime": 0,
+        "boeFlag": 0,
+        "category": 0,
+        "courseSyncFlag": 0,
+        "endTime": 0,
+        "level": 0,
+        "manager": "",
+        "managerId": "",
+        "name": "",
+        "notice": state.value2,
+        "noticeFlag": 0,
+        "picUrl": "",
+        "projectTemplateId": 0,
+        "remark": "",
+        "sourceBelongId": 0,
+        "status": 0,
+        "systemId": 0
+      };
+      api.templateEdit(obj).methods(obj).then(res => {
+        message.success("公告发布成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("公告发布失败"+err)
+        console.log(err)
+      })
+    }
+    // 删除阶段
+    const stateDel = (id) => {
+      api.deleteStage(id).then(res => {
+        message.success("删除阶段成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("删除阶段失败"+err)
+        console.log(err)
+      })
+    }
+    
+    // 删除任务
+    const taskDel = (id) => {
+      api.deleteTask(id).then(res => {
+      message.success("删除任务成功")
+      console.log(res)
+    }).catch(err => {
+      message.error("删除任务失败"+err)
+      console.log(err)
+    })
+    }
+    
+    // 新建或编辑阶段 
+    const stateEdit = () => {
+      let obj={
+        "name": "",
+        "projectTemplateId": 0,
+        "remark": "",
+        "stageId": 0
+      }
+      api.editStagek(obj).then(res => {
+        message.success("编辑阶段成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑阶段失败"+err)
+        console.log(err)
+      })
+    }
+    //新建或编辑阶段任务
+    const taskEdit = () => {
+      let obj = {
+        "courseId": 0,
+        "duration": 0,
+        "flag": true,
+        "name": "",
+        "projectTaskId": 0,
+        "projectTemplateId": 0,
+        "stageId": 0,
+        "type": 0
+      }
+      api.editTask(obj).then(res => {
+        message.success("编辑任务成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑任务失败"+err)
+        console.log(err)
+      })
+    }
     return {
       ...toRefs(state),
       value,
@@ -727,6 +952,13 @@ export default defineComponent({
       changeopclo,
       changecheck2,
       changecheck3,
+      cancelEdit,
+      confirmEdit,
+      addNotice,
+      stateDel,
+      taskDel,
+      stateEdit,
+      taskEdit,
     };
   },
   computed: {
@@ -738,6 +970,12 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.editBtn {
+      float:right; 
+      margin-right: 150px;
+      color:#4ea6ff;
+      cursor: pointer;
+    }
 .clearfix:before,
 .clearfix:after {
   content: " ";
@@ -780,6 +1018,7 @@ export default defineComponent({
         margin-top: 20px;
       }
     }
+    
     @media screen and (max-width: 1030px) {
       .imgfor {
         margin-left: 20px;
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index 0bb54282..972071c7 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -137,7 +137,7 @@ export default defineComponent({
                 {value.status === "已发布" ? (
                   <div class="nselect">
                     <div class="ops2">
-                      <router-link to="/taskpage">
+                      <router-link to="/libraryadd">
                         <div class="jc">
                           查看{" "}
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>

From 3dc053d4adc11a6926de215aed2515a149d0b992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 11:41:31 +0800
Subject: [PATCH 50/90] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue       | 652 ++++++++++++----------
 src/views/learningpath/LevelAddDetail.vue | 251 ++++++++-
 src/views/projectcenter/TaskAdd.vue       |  57 +-
 src/views/projectcenter/TaskPage.vue      |  12 +-
 4 files changed, 627 insertions(+), 345 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index d980a164..cba94412 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2,11 +2,11 @@
   <div class="addwrapper">
     <div class="addhead">
       <div class="leftimg">
-        <img class="img" src="../../assets/px.jpg" />
+        <img class="img" :src="picUrl" />
       </div>
       <div class="imgfor">
-        <div class="forz">产品经理进阶路径</div>
-        <div class="fort">创建时间：2022-07-21 00:00</div>
+        <div class="forz">{{ styTitle }}</div>
+        <div class="fort">创建时间：{{ cretime }}</div>
       </div>
       <div class="right">
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
@@ -116,34 +116,46 @@
             <div class="onerow"><div class="taskmain">关卡概览</div></div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
-                <span class="nub1">{{routerInfoOverview.totalStudentCnt}}</span>
+                <span class="nub1">{{
+                  routerInfoOverview.totalStudentCnt
+                }}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #ff90ae">{{routerInfoOverview.studyStudentCnt}}</span>
+                <span class="nub1" style="color: #ff90ae">{{
+                  routerInfoOverview.studyStudentCnt
+                }}</span>
                 <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
-                <span class="nub1" style="color: #a497ff">{{routerInfoOverview.completeStudentCnt}}</span>
+                <span class="nub1" style="color: #a497ff">{{
+                  routerInfoOverview.completeStudentCnt
+                }}</span>
                 <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #5dc988">{{routerInfoOverview.onlineCourseCnt}}</span
+                  <span class="nub1" style="color: #5dc988">{{
+                    routerInfoOverview.onlineCourseCnt
+                  }}</span
                   ><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">在线课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #ff90ae">{{routerInfoOverview.offLineCourseCnt}}</span
+                  <span class="nub1" style="color: #ff90ae">{{
+                    routerInfoOverview.offLineCourseCnt
+                  }}</span
                   ><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">面授课程数</div>
               </div>
               <div class="nubbox">
                 <div>
-                  <span class="nub1" style="color: #a497ff">{{routerInfoOverview.completeRatio}}</span
+                  <span class="nub1" style="color: #a497ff">{{
+                    routerInfoOverview.completeRatio
+                  }}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">总完成率</div>
@@ -151,11 +163,17 @@
             </div>
             <div class="onerow"><div class="taskmain">关卡信息</div></div>
             <div class="stagemess">
-              <div v-for="item in stageList" 
-              :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
-              :key="item.stageId" @click="choosedStageId = item.stageId">
-              {{item.stage}}
-            </div>
+              <div
+                v-for="item in stageList"
+                :class="{
+                  stage1: item.stageId == choosedStageId,
+                  stage2: item.stageId != choosedStageId,
+                }"
+                :key="item.stageId"
+                @click="choosedStageId = item.stageId"
+              >
+                {{ item.stage }}
+              </div>
               <!-- <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div> -->
             </div>
@@ -192,20 +210,35 @@
                 <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
-                <div class="pronub" style="margin-left: 280px">{{chapterOverviewList.totalTaskCnt}}</div>
+                <div class="pronub" style="margin-left: 280px">
+                  {{ chapterOverviewList.totalTaskCnt }}
+                </div>
                 <div class="proright1">
                   <span class="textpro">关卡任务总数</span>
-                  <a-progress :percent="chapterOverviewList.totalTaskCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="chapterOverviewList.totalTaskCnt"
+                    style="width: 369px"
+                  />
+                </div>
+                <div class="pronub" style="margin-left: 206px">
+                  {{ chapterOverviewList.totalReqCnt }}
                 </div>
-                <div class="pronub" style="margin-left: 206px">{{chapterOverviewList.totalReqCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress :percent="chapterOverviewList.totalReqCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="chapterOverviewList.totalReqCnt"
+                    style="width: 369px"
+                  />
+                </div>
+                <div class="pronub" style="margin-left: 142px">
+                  {{ chapterOverviewList.totalOptCnt }}
                 </div>
-                <div class="pronub" style="margin-left: 142px">{{chapterOverviewList.totalOptCnt}}</div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress :percent="chapterOverviewList.totalOptCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="chapterOverviewList.totalOptCnt"
+                    style="width: 369px"
+                  />
                 </div>
               </div>
             </div>
@@ -264,27 +297,27 @@
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
-            <router-link :to="{ path: '/leveladddetail' }">
-              <div
-                class="taskbox"
-                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
-              >
-                <div class="leftt">
-                  <img src="../../assets/images/taskpage/left1.png" />
+              <router-link :to="{ path: '/leveladddetail' }">
+                <div
+                  class="taskbox"
+                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+                >
+                  <div class="leftt">
+                    <img src="../../assets/images/taskpage/left1.png" />
+                  </div>
+                  <div class="photo">
+                    <img src="../../assets/images/taskpage/picture1.png" />
+                  </div>
+                  <div class="rightt">
+                    <img src="../../assets/images/taskpage/right1.png" />
+                  </div>
+                  <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
+                    添加关卡
+                  </div>
+                  <div class="centermain">快速创建关卡任务</div>
                 </div>
-                <div class="photo">
-                  <img src="../../assets/images/taskpage/picture1.png" />
-                </div>
-                <div class="rightt">
-                  <img src="../../assets/images/taskpage/right1.png" />
-                </div>
-                <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
-                  添加关卡
-                </div>
-                <div class="centermain">快速创建关卡任务</div>
-              </div>
-            </router-link>
-          </div>
+              </router-link>
+            </div>
             <!-- 无数据显示快速创建 -->
 
             <!-- 有数据-->
@@ -360,16 +393,14 @@
                         </div>
                       </div>
                       <div>
-                        <div class="iconame">「{{checkType(item.type)}}」</div>
+                        <div class="iconame">
+                          「{{ checkType(item.type) }}」
+                        </div>
                         <div class="icontext">{{ item.name }}</div>
                       </div>
                     </div>
                     <div class="type">
-                      <div
-                        :class="
-                          item.flag ? 'typename1' : 'typename'
-                        "
-                      >
+                      <div :class="item.flag ? 'typename1' : 'typename'">
                         {{ item.flag ? "必修" : "选修" }}
                       </div>
                     </div>
@@ -429,7 +460,7 @@
                               : 'none',
                         }"
                         @click="
-                          item.type ===2
+                          item.type === 2
                             ? showCopyModal(item.type)
                             : item.type === 6
                             ? showzhibModal(item.type)
@@ -546,7 +577,7 @@
                     :current="currentPage"
                     :total="tableDataTotal"
                     class="pagination"
-                    style="display:none"
+                    style="display: none"
                   />
                 </div>
               </div>
@@ -559,136 +590,153 @@
 
           <a-tabs>
             <a-tab-pane key="1" tab="基本信息">
-            <div class="sametab">
-              <div class="Gcon">
-                <div class="pad"></div>
-                <div class="Gin">
-                  <div class="headone">
-                    <div class="box"></div>
-                    <div class="onetitle">关卡内容可见可学设置</div>
-                    <div class="oneedi" @click="showbtn" v-show="twobtn">
-                      编辑
-                    </div>
-                    <div v-show="twobtnn" class="twobtn">
-                      <div class="btnone" @click="closebtn">取消</div>
-                      <div class="btntwo" @click="closebtn">确定</div>
-                    </div>
-                  </div>
-                  <div class="onemain clearfix">
-                    <div class="checkcon">
-                      <input
-                        type="checkbox"
-                        name="cb1"
-                        value="yulan"
-                        class="in"
-                      />
-                      <span class="yulan">预览其他关卡</span><br />
-                      <div style="width: 10px; height: 4px"></div>
-                      <div style="display: flex; align-items: center">
-                        <span class="yulan2">学员可预览第</span>
-                        <span style="color: #4ea6ff" v-show="number">1</span>
-                        <a-input-number
-                          v-model:value="nubvalue"
-                          v-show="inputbox"
-                          :controls="false"
-                          :autofocus="true"
-                          :min="1"
-                        />
-                        <span>关-第</span
-                        ><span style="color: #4ea6ff" v-show="number">4</span>
-                        <a-input-number
-                          v-model:value="nubvalue1"
-                          v-show="inputbox"
-                          :controls="false"
-                          :autofocus="true"
-                          :min="1"
-                        />
-                        <span>关内容</span>
+              <div class="sametab">
+                <div class="Gcon">
+                  <div class="pad"></div>
+                  <div class="Gin">
+                    <div class="headone">
+                      <div class="box"></div>
+                      <div class="onetitle">关卡内容可见可学设置</div>
+                      <div class="oneedi" @click="showbtn" v-show="twobtn">
+                        编辑
+                      </div>
+                      <div v-show="twobtnn" class="twobtn">
+                        <div class="btnone" @click="closebtn">取消</div>
+                        <div class="btntwo" @click="closebtn">确定</div>
                       </div>
                     </div>
-                    <div class="checkcon" style="margin-top: 20px">
-                      <input
-                        type="checkbox"
-                        name="cb1"
-                        value="xuexi"
-                        class="in"
-                      />
-                      <span class="yulan">学习其他关卡</span><br />
-                      <div style="width: 10px; height: 4px"></div>
-                      <div style="display: flex; align-items: center">
-                        <span class="yulan2">学员可预览第</span>
-                        <span style="color: #4ea6ff" v-show="number">1</span>
-                        <a-input-number
-                          v-model:value="nubvalue2"
-                          v-show="inputbox"
-                          :controls="false"
-                          :autofocus="true"
-                          :min="1"
+                    <div class="onemain clearfix">
+                      <div class="checkcon">
+                        <input
+                          type="checkbox"
+                          name="cb1"
+                          value="yulan"
+                          class="in"
                         />
-                        <span>关-第</span
-                        ><span style="color: #4ea6ff" v-show="number">4</span>
-                        <a-input-number
-                          v-model:value="nubvalue3"
-                          v-show="inputbox"
-                          :controls="false"
-                          :autofocus="true"
-                          :min="1"
-                        />
-                        <span>关内容</span>
+                        <span class="yulan">预览其他关卡</span><br />
+                        <div style="width: 10px; height: 4px"></div>
+                        <div style="display: flex; align-items: center">
+                          <span class="yulan2">学员可预览第</span>
+                          <span style="color: #4ea6ff" v-show="number">1</span>
+                          <a-input-number
+                            v-model:value="nubvalue"
+                            v-show="inputbox"
+                            :controls="false"
+                            :autofocus="true"
+                            :min="1"
+                          />
+                          <span>关-第</span
+                          ><span style="color: #4ea6ff" v-show="number">4</span>
+                          <a-input-number
+                            v-model:value="nubvalue1"
+                            v-show="inputbox"
+                            :controls="false"
+                            :autofocus="true"
+                            :min="1"
+                          />
+                          <span>关内容</span>
+                        </div>
                       </div>
+                      <div class="checkcon" style="margin-top: 20px">
+                        <input
+                          type="checkbox"
+                          name="cb1"
+                          value="xuexi"
+                          class="in"
+                        />
+                        <span class="yulan">学习其他关卡</span><br />
+                        <div style="width: 10px; height: 4px"></div>
+                        <div style="display: flex; align-items: center">
+                          <span class="yulan2">学员可预览第</span>
+                          <span style="color: #4ea6ff" v-show="number">1</span>
+                          <a-input-number
+                            v-model:value="nubvalue2"
+                            v-show="inputbox"
+                            :controls="false"
+                            :autofocus="true"
+                            :min="1"
+                          />
+                          <span>关-第</span
+                          ><span style="color: #4ea6ff" v-show="number">4</span>
+                          <a-input-number
+                            v-model:value="nubvalue3"
+                            v-show="inputbox"
+                            :controls="false"
+                            :autofocus="true"
+                            :min="1"
+                          />
+                          <span>关内容</span>
+                        </div>
+                      </div>
+                      <br />
                     </div>
-                    <br />
                   </div>
                 </div>
               </div>
-              
-            </div>
-          </a-tab-pane>
+            </a-tab-pane>
 
-          <a-tab-pane key="2" tab="共享文档">
-            <div class="sametab">
-              <div class="Gcon">
-                <div class="pad"></div>
-                <div class="Gin">
-                  <div class="headone">
-                    <div class="box"></div>
-                    <div class="onetitle">上传共享文档</div>
-                    <div class="oneedi">
-                      <a-switch v-model:checked="docChecked" ></a-switch>
+            <a-tab-pane key="2" tab="共享文档">
+              <div class="sametab">
+                <div class="Gcon">
+                  <div class="pad"></div>
+                  <div class="Gin">
+                    <div class="headone">
+                      <div class="box"></div>
+                      <div class="onetitle">上传共享文档</div>
+                      <div class="oneedi">
+                        <a-switch v-model:checked="docChecked"></a-switch>
+                      </div>
+                    </div>
+                    <div class="btnbox" style="margin: 20px">
+                      <a-upload
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/api/file/upload"
+                        @change="handleChange"
+                      >
+                        <span
+                          class="xkbtn"
+                          style="cursor: pointer; font-size: 17px"
+                          >上传</span
+                        >
+                        <img
+                          src="@/assets/images/basicinfo/cloud.png"
+                          style="cursor: pointer; width: 34px; height: 34px"
+                          alt=""
+                        />
+                      </a-upload>
+                      <div class="btnbox" style="margin: 20px">
+                        <span style="color: #999999">
+                          支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                        </span>
+                      </div>
+                      <div
+                        v-for="item in docList"
+                        :key="item.src"
+                        class="docListStyle"
+                      >
+                        <img
+                          src="@/assets/images/basicinfo/download.png"
+                          style="
+                            cursor: pointer;
+                            width: 40px;
+                            height: 40px;
+                            margin-right: 40px;
+                          "
+                          alt=""
+                        />
+                        <span style="font: oblique 16px Sans-serif">{{
+                          item.name
+                        }}</span>
+                        <span style="color: #4ea6ff; float: right">删除</span>
+                      </div>
                     </div>
                   </div>
-                  <div class="btnbox" style="margin:20px;">
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  action="/api/file/upload"
-                  @change="handleChange"
-                >
-                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
-                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
-                  width:34px;height:34px;
-                  " alt="">
-                </a-upload>
-                <div class="btnbox" style="margin:20px;">
-                <span style="color: #999999">
-                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
-                </span>
-              </div>
-              <div v-for="item in docList" :key="item.src" class="docListStyle">
-                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
-                  width:40px;height:40px;margin-right:40px;
-                  " alt="">
-                <span style="font: oblique   16px Sans-serif">{{item.name}}</span> 
-                <span style="color: #4ea6ff;float:right;">删除</span>
-              </div>
-              </div>
                 </div>
               </div>
-            </div>
-          </a-tab-pane>
-
+            </a-tab-pane>
           </a-tabs>
-          </a-tab-pane>
+        </a-tab-pane>
       </a-tabs>
       <a-modal
         style="padding: 0"
@@ -848,10 +896,10 @@
       <!-- 导入学员抽屉 -->
       <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
       <!-- 学员管理查看抽屉 -->
-      <check-stu 
-      v-model:CheckStuvisible="CheckStuvisible"
-      v-model:studentId="studentId"
-       />
+      <check-stu
+        v-model:CheckStuvisible="CheckStuvisible"
+        v-model:studentId="studentId"
+      />
       <!-- 面授学员抽屉 -->
       <face-stu v-model:FSvisible="FSvisible" />
       <!-- 活动考勤抽屉 -->
@@ -875,8 +923,8 @@
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs,onMounted, createVNode } from "vue";
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { ref, reactive, toRefs, onMounted, createVNode } from "vue";
+import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { message, Modal } from "ant-design-vue";
 import PathAddStu from "../../components/drawers/pathStuAdd";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
@@ -893,6 +941,7 @@ import { storage } from "../../api/storage";
 import { getRouterOverview } from "@/api/indexLearningPath";
 import { GetRouterDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
+import { toDate } from "../../api/method";
 
 export default {
   name: "LevelAdd",
@@ -912,36 +961,41 @@ export default {
     // const routers = useRoute();
     // const store = useStore();
     const state = reactive({
-      routerId: storage.get("routerId") ?JSON.parse(storage.get("routerId"))  : null, //学习路径页面传的学习路径id
+      routerId: storage.get("routerId")
+        ? JSON.parse(storage.get("routerId"))
+        : null, //学习路径页面传的学习路径id
       gatename: null, //关卡名称
       gatenamee: null, //学员管理关卡名称
       deleteAll: false, //批量删除学员弹窗
       Stuvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
       CheckStuvisible: false, //学员管理的查看抽屉
-      addLoading:false, // 加载动画
-      choosedStageId:1, // 选择的阶段id
+      addLoading: false, // 加载动画
+      choosedStageId: 1, // 选择的阶段id
       twobtn: true,
       number: true,
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
-      studentId:null,
+      studentId: null,
+      styTitle: null,
+      cretime: null,
+      picUrl: null,
       // 共享文档列表
-      docList:[
+      docList: [
         {
-          name:'测试文档1.doc',
-          src:"",
+          name: "测试文档1.doc",
+          src: "",
         },
         {
-          name:'测试文档2.doc',
-          src:"",
+          name: "测试文档2.doc",
+          src: "",
         },
         {
-          name:'测试文档3.doc',
-          src:"",
-        }
-      ], 
+          name: "测试文档3.doc",
+          src: "",
+        },
+      ],
       huodModal: false,
       zhibModal: false,
       //任务大纲列表
@@ -957,11 +1011,10 @@ export default {
               total: 50, //总人数
               complete: 20, //完成人数
               percent: 40,
-              routerTaskId:0,
-            }
+              routerTaskId: 0,
+            },
           ],
-        }
-        
+        },
       ],
       activeKey: ref("1"),
       value: ref(" "),
@@ -969,8 +1022,8 @@ export default {
       nubvalue2: ref("1"),
       nubvalue3: ref("4"),
       nubvalue1: ref("4"),
-      fileList:ref([]),
-      docChecked:true,
+      fileList: ref([]),
+      docChecked: true,
       currentPage: 1,
       tableDataTotal: 100,
       pageSize: 10,
@@ -1022,33 +1075,36 @@ export default {
     });
 
     const levelList = reactive({
-      routerInfoOverview:{ // 路径图整体数据概览
-        totalStudentCnt:0,
-        studyStudentCnt:0,
-        completeStudentCnt:0,
-        onlineCourseCnt:0,
-        offLineCourseCnt:0,
-        completeRatio:0,
+      routerInfoOverview: {
+        // 路径图整体数据概览
+        totalStudentCnt: 0,
+        studyStudentCnt: 0,
+        completeStudentCnt: 0,
+        onlineCourseCnt: 0,
+        offLineCourseCnt: 0,
+        completeRatio: 0,
       },
-      chapterOverviewList:{ // 路径图阶段数据概览
-        completeCourseRatio:0,
-        completeExamRatio:0,
-        completeRatio:0,
-        totalTaskCnt:0,
-        totalReqCnt:0,
-        totalOptCnt:0,
+      chapterOverviewList: {
+        // 路径图阶段数据概览
+        completeCourseRatio: 0,
+        completeExamRatio: 0,
+        completeRatio: 0,
+        totalTaskCnt: 0,
+        totalReqCnt: 0,
+        totalOptCnt: 0,
       },
-      stageList: [ // 阶段列表
+      stageList: [
+        // 阶段列表
         {
-          stageId:1,
-          stage:"关卡一"
+          stageId: 1,
+          stage: "关卡一",
         },
         {
-          stageId:2,
-          stage:"关卡二"
-        }
-      ]
-    })
+          stageId: 2,
+          stage: "关卡二",
+        },
+      ],
+    });
 
     const tableDataFunc = () => {
       const columns = [
@@ -1148,9 +1204,14 @@ export default {
                   >
                     调整
                   </span>
-                  <span style="color:#4EA6FF;cursor:pointer"
-                  onClick={() => {delConfirm(text.record.studentId)}}
-                  >删除</span>
+                  <span
+                    style="color:#4EA6FF;cursor:pointer"
+                    onClick={() => {
+                      delConfirm(text.record.studentId);
+                    }}
+                  >
+                    删除
+                  </span>
                 </div>
               </div>
             );
@@ -1250,8 +1311,8 @@ export default {
 
     const changeTabs = (e) => {
       console.log("切换tabs", e, state.routerId);
-      if(e == 2) {
-        myGetRouterDetail()
+      if (e == 2) {
+        myGetRouterDetail();
       }
       //学员管理
       if (e == 3) {
@@ -1272,21 +1333,21 @@ export default {
         .then((res) => {
           console.log("获取学员列表", res);
           let data = res.data.data.rows || null;
-          state.tableData = []
-          if(data.length){
-            for(let i in data) {
-              let _time = new Date(data[i].beginStudyTime*1000);
+          state.tableData = [];
+          if (data.length) {
+            for (let i in data) {
+              let _time = new Date(data[i].beginStudyTime * 1000);
               state.tableData.push({
-                key:i+1,
-                com:data[i].userInfoBo.deptName,
-                name:data[i].userInfoBo.userName,
-                gang:data[i].userInfoBo.jobName,
-                cur:data[i].currentChapterName || '0',
-                jin:data[i].completeChapterCnt+'/'+ data[i].totalChapterCnt,
-                time:_time.toLocaleDateString(),
-                studentId:data[i].studentId,
-              })
-              
+                key: i + 1,
+                com: data[i].userInfoBo.deptName,
+                name: data[i].userInfoBo.userName,
+                gang: data[i].userInfoBo.jobName,
+                cur: data[i].currentChapterName || "0",
+                jin: data[i].completeChapterCnt + "/" + data[i].totalChapterCnt,
+                time: _time.toLocaleDateString(),
+                studentId: data[i].studentId,
+              });
+
               // state.tableData[i].key = i+1;
               // state.tableData[i].com = data[i].userInfoBo.deptName;
               // state.tableData[i].name = data[i].userInfoBo.userName
@@ -1301,8 +1362,8 @@ export default {
           console.log("获取学员列表失败", err);
         });
     };
-  const checkType = (type) => {
-    let typeRules = [
+    const checkType = (type) => {
+      let typeRules = [
         "",
         "在线",
         "面授",
@@ -1318,57 +1379,71 @@ export default {
         "投票",
       ];
       return typeRules[type];
-  }
+    };
 
     //学员管理------------------------------------------------
 
     onMounted(() => {
       state.addLoading = true;
-      getOverview()
-    })
+      getOverview();
+      GetRouterDetail(state.routerId).then((res) => {
+        state.styTitle = res.data.data.routerInfo.name;
+        state.cretime = toDate(
+          res.data.data.routerInfo.createTime / 1000,
+          "Y-M-D h:m"
+        );
+        state.picUrl = res.data.data.routerInfo.picUrl;
+      });
+    });
 
     // 获取项目概览
-    const getOverview = () =>{
-      getRouterOverview(state.routerId).then((res) => {
-        Object.keys(res.data.data.routerInfoOverview).forEach(item => {
-          levelList.routerInfoOverview[item] = res.data.data.routerInfoOverview[item] || 0
+    const getOverview = () => {
+      getRouterOverview(state.routerId)
+        .then((res) => {
+          Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
+            levelList.routerInfoOverview[item] =
+              res.data.data.routerInfoOverview[item] || 0;
+          });
+          Object.keys(res.data.data.chapterOverviewList).forEach((item) => {
+            levelList.chapterOverviewList[item] =
+              res.data.data.chapterOverviewList[item] || 0;
+          });
+          // res.data.data.routerInfoOverview.forEach((r) => {
+          //   console.log(r)
+          // })
+          state.addLoading = false;
+          console.log("项目概览--" + res);
         })
-        Object.keys(res.data.data.chapterOverviewList).forEach(item => {
-          levelList.chapterOverviewList[item] = res.data.data.chapterOverviewList[item] || 0
-        })
-        // res.data.data.routerInfoOverview.forEach((r) => {
-        //   console.log(r)
-        // })
-        state.addLoading = false;
-        console.log("项目概览--"+res)
-      }).catch(err => {
-        state.addLoading = false;
-        message.error("概览获取失败")
-        console.log("获取失败"+err)
-      })
-    }
+        .catch((err) => {
+          state.addLoading = false;
+          message.error("概览获取失败");
+          console.log("获取失败" + err);
+        });
+    };
     // 获取路径列表
     const myGetRouterDetail = () => {
-      GetRouterDetail(state.routerId).then(res => {
-        let data = res.data.data.chapterList
-        state.taskSyllabus = data
-        // for(let i in data) {
-        //   state.taskSyllabus[i].name = data[i].name
-        //   if(data[i].taskList.length > 0) {
-        //     for(let j in data[i].taskList) {
-        //     Object.keys(data[i].taskList[j]).forEach(item => {
-        //     state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
-        // })
-        //   }
-        //   }
-          
-        // }
-      }).catch(err => {
-        console.log(err)
-        message.error('获取路径列表失败'+err);
-      })
+      GetRouterDetail(state.routerId)
+        .then((res) => {
+          let data = res.data.data.chapterList;
 
-    }
+          state.taskSyllabus = data;
+          // for(let i in data) {
+          //   state.taskSyllabus[i].name = data[i].name
+          //   if(data[i].taskList.length > 0) {
+          //     for(let j in data[i].taskList) {
+          //     Object.keys(data[i].taskList[j]).forEach(item => {
+          //     state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
+          // })
+          //   }
+          //   }
+
+          // }
+        })
+        .catch((err) => {
+          console.log(err);
+          message.error("获取路径列表失败" + err);
+        });
+    };
 
     const handleChange = (info) => {
       if (info.file.status !== "uploading") {
@@ -1383,23 +1458,26 @@ export default {
     };
 
     const delConfirm = (id) => {
-        Modal.confirm({
-        title: '是否确认删除',
+      Modal.confirm({
+        title: "是否确认删除",
         icon: createVNode(ExclamationCircleOutlined),
-        content: '',
-        okText: '确认',
-        cancelText: '取消',
-        onOk(){
-          api.delStudent({routerId:100,studentIds:[id]}).then(res => {
-          message.success("删除成功")
-          console.log(res)
-        }).catch(err => {
-          message.error("删除失败"+err)
-          console.log(err)
-        })
-        }
+        content: "",
+        okText: "确认",
+        cancelText: "取消",
+        onOk() {
+          api
+            .delStudent({ routerId: 100, studentIds: [id] })
+            .then((res) => {
+              message.success("删除成功");
+              console.log(res);
+            })
+            .catch((err) => {
+              message.error("删除失败" + err);
+              console.log(err);
+            });
+        },
       });
-    }
+    };
 
     return {
       ...toRefs(state),
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 2e720f90..1482543f 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -179,11 +179,11 @@
         <div class="filt">
           <div class="le">
             <div class="leftimg">
-              <img class="img" src="../../assets/px.jpg" />
+              <img class="img" :src="picUrl" />
             </div>
             <div class="imgfor">
-              <div class="forz">产品经理进阶路径</div>
-              <div class="fort">创建时间：2022-07-21 00:00</div>
+              <div class="forz">{{ styTitle }}</div>
+              <div class="fort">创建时间：{{ creTime }}</div>
             </div>
           </div>
           <div class="rightt">
@@ -266,7 +266,7 @@
           <div>
             <add-test
               v-model:addtestVisible="addtestvisible"
-             :isLevel="isLevel"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:edit="edit"
@@ -288,7 +288,7 @@
           <div>
             <add-live
               v-model:addliveVisible="addlivevisible"
-             :isLevel="isLevel"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:routerId="routerId"
@@ -310,7 +310,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-             :isLevel="isLevel"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:routerId="routerId"
@@ -333,7 +333,7 @@
             <add-discuss
               v-model:adddiscussVisible="adddiscussvisible"
               @changeData="updateTableData"
-             :isLevel="isLevel"
+              :isLevel="isLevel"
               v-model:isactive="isactive"
               v-model:edit="edit"
               v-model:routerId="routerId"
@@ -354,7 +354,7 @@
           <div>
             <add-active
               v-model:addactiveVisible="addactivevisible"
-             :isLevel="isLevel"
+              :isLevel="isLevel"
               v-model:edit="edit"
               v-model:isactive="isactive"
               @changeData="updateTableData"
@@ -376,7 +376,7 @@
             <div>
               <add-eval
                 v-model:addevalVisible="addevalvisible"
-               :isLevel="isLevel"
+                :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -399,7 +399,7 @@
             <div>
               <add-invist
                 v-model:addinvistVisible="addinvistvisible"
-               :isLevel="isLevel"
+                :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -423,7 +423,7 @@
             <div>
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
-               :isLevel="isLevel"
+                :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -456,7 +456,7 @@
               <span>任务列表</span>
             </div>
             <div class="tit_right">
-              <div class="btn btn1" @click="moveTask">
+              <div class="btn btn1" @click="showChangeModal">
                 <div class="btnText">移动到任务阶段</div>
               </div>
               <div class="btn btn2">
@@ -895,6 +895,57 @@
         </div>
       </div>
     </a-modal>
+
+    <!-- 移动任务到阶段 -->
+    <a-modal
+      style="padding: 0"
+      :closable="sh"
+      v-model:visible="visiblene"
+      :footer="null"
+      centered="true"
+      wrapClassName="moveModal"
+    >
+      <div class="con">
+        <div class="header">
+          <div class="inhe">
+            <div class="mod"></div>
+            <div class="tz">选择任务移动到阶段</div>
+          </div>
+        </div>
+        <div class="mid">
+          <div class="inher">
+            <div class="cur">已选中{{ selectRow.length }}个任务</div>
+            <div class="select">
+              <a-select
+                v-model:value="curLevel"
+                style="width: 100%"
+                placeholder="请选择阶段"
+                :options="level"
+                @change="handleChangeStage"
+                allowClear
+                showSearch
+              ></a-select>
+            </div>
+            <div class="btn">
+              <button
+                style="cursor: pointer"
+                class="sameb btn1"
+                @click="closeChangeModal"
+              >
+                取消
+              </button>
+              <button
+                style="cursor: pointer"
+                class="sameb btn2"
+                @click="moveTask"
+              >
+                确定
+              </button>
+            </div>
+          </div>
+        </div>
+      </div></a-modal
+    >
   </div>
 </template>
 
@@ -918,6 +969,7 @@ import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -1162,7 +1214,7 @@ export default {
       value2: "",
       selectedRowKeys: [],
       edit: false, //是否点击编辑
-      isLevel:1,//学习路径1项目2模板库3
+      isLevel: 1, //学习路径1项目2模板库3
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
@@ -1178,6 +1230,11 @@ export default {
       ListChoosedId: 0,
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
+      visiblene: false, //移动任务弹窗
+      removeStageId: null,
+      styTitle: null,
+      creTime: null,
+      picUrl: null,
     });
 
     //新建关卡
@@ -1318,6 +1375,18 @@ export default {
         .then((res) => {
           console.log("res.data.data.chapterList", res.data.data.chapterList);
           state.level = res.data.data.chapterList;
+          state.styTitle = res.data.data.routerInfo.name;
+          state.creTime = toDate(
+            res.data.data.routerInfo.createTime / 1000,
+            "Y-M-D h:m"
+          );
+          state.picUrl = res.data.data.routerInfo.picUrl;
+
+          //增加两个字段
+          state.level.forEach((item) => {
+            item["value"] = item.chapterId;
+            item["label"] = item.name;
+          });
           if (state.level.length > 0) {
             dataAssignment(state.level[0].chapterId);
             state.isactive = state.level[0].chapterId;
@@ -1676,20 +1745,29 @@ export default {
     };
     //移动任务到关卡
     const moveTask = () => {
-      let obj = {
-        chapterId: state.isactive,
-        routerTaskIdList: state.selectRow,
-      };
-      api
-        .moveTask(obj)
-        .then((res) => {
-          console.log("移动成功", res);
-          message.destroy();
-          message.success("移动成功");
-        })
-        .catch((err) => {
-          console.log("移动失败", err);
-        });
+      if (state.isactive == state.removeStageId) {
+        message.destroy();
+        message.warning("选择的任务已在当前阶段");
+      } else if (state.removeStageId == null) {
+        message.destroy();
+        message.warning("请选择关卡");
+      } else {
+        let obj = {
+          chapterId: state.removeStageId,
+          routerTaskIdList: state.selectRow,
+        };
+        api
+          .moveTask(obj)
+          .then((res) => {
+            console.log("移动成功", res);
+            message.destroy();
+            message.success("移动成功");
+          })
+          .catch((err) => {
+            console.log("移动失败", err);
+          });
+        state.visiblene = false;
+      }
     };
 
     //编辑的按钮
@@ -1757,6 +1835,21 @@ export default {
           message.warning("修改失败");
         });
     };
+    const showChangeModal = () => {
+      if (state.selectRow.length == 0) {
+        message.destroy();
+        return message.warning("请选择要移动的任务");
+      } else {
+        state.visiblene = true;
+      }
+    };
+    const closeChangeModal = () => {
+      state.visiblene = false;
+    };
+    const handleChangeStage = (value, option) => {
+      console.log("阶段改变", value, option);
+      state.removeStageId = option.chapterId;
+    };
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1799,6 +1892,9 @@ export default {
       updateTableData,
       deleteChapter,
       changeCourseType,
+      showChangeModal,
+      closeChangeModal,
+      handleChangeStage,
     };
   },
 };
@@ -1916,6 +2012,107 @@ export default {
     }
   }
 }
+.moveModal {
+  .ant-modal {
+    width: 549px !important;
+    height: 245px !important;
+    .ant-modal-content {
+      width: 549px !important;
+      height: 245px !important;
+      .ant-modal-body {
+        padding: 0 !important;
+        width: 549px !important;
+        height: 245px !important;
+        .con {
+          // background-color: #bfa;
+          width: 100%;
+          height: 100%;
+
+          .header {
+            width: 100%;
+            display: flex;
+            height: 68px;
+            position: relative;
+            justify-content: center;
+
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+            .inhe {
+              width: 80%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              .mod {
+                left: 30px;
+                top: 27px;
+                position: absolute;
+                width: 18px;
+                height: 17px;
+                background-image: url(../../assets/images/leveladd/mod.png);
+              }
+              .tz {
+                color: #000000;
+                font-weight: 400;
+                font-size: 16px;
+              }
+              .mg {
+                width: 20px;
+                height: 20px;
+                background-image: url(../../assets/images/basicinfo/close22.png);
+                background-size: 100% 100%;
+                cursor: pointer;
+              }
+            }
+          }
+          .mid {
+            width: 100%;
+            display: flex;
+            height: 100%;
+            justify-content: center;
+            .inher {
+              width: 80%;
+              height: 100%;
+              .cur {
+                color: #6f6f6f;
+                font-size: 14px;
+              }
+              .select {
+                margin-top: 10px;
+              }
+              .btn {
+                width: 100%;
+                display: flex;
+                justify-content: center;
+                margin-top: 30px;
+                .sameb {
+                  width: 100px;
+                  height: 40px;
+                  font-size: 14px;
+
+                  border-radius: 8px;
+                }
+                .btn1 {
+                  color: #4ea6ff;
+                  background: #ffffff;
+                  border: 1px solid #4ea6ff;
+                }
+                .btn2 {
+                  margin-left: 16px;
+                  border: 0;
+                  color: #ffffff;
+                  background: #4ea6ff;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 .clearfix:after,
 .clearfix:before {
   content: " ";
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 0e77c0cf..8a83b195 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -53,13 +53,12 @@
         <div class="filt">
           <div class="le">
             <div class="leftimg">
-              <img
-                class="img"
-                src="../../assets/images/projectadd/picture.png"
-              />
+              <img class="img" :src="picUrl" />
             </div>
             <div class="imgfor">
-              <div class="forz" style="font-weight: 700">管理者进阶-腾飞班</div>
+              <div class="forz" style="font-weight: 700">
+                {{ projectTitle }}
+              </div>
             </div>
           </div>
           <div class="rightt">
@@ -97,15 +96,16 @@
           </div>
           <!-- 添加在线侧弹窗 -->
           <div>
-            <add-online 
-            v-model:addonlineVisible="addonlinevisible" 
-            @changeData="updateTableData"
-            :isLevel="isLevel"
+            <add-online
+              v-model:addonlineVisible="addonlinevisible"
+              @changeData="updateTableData"
+              :isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
-              v-model:EditOnlineId = "EditOnlineId"/>
+              v-model:EditOnlineId="EditOnlineId"
+            />
           </div>
           <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
@@ -119,8 +119,9 @@
           </div>
           <!-- 添加面授侧弹窗 -->
           <div>
-            <add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" 
-            v-model:EditEvalId="EditEvalId"
+            <add-faceteach
+              v-model:addfaceteachVisible="addfaceteachvisible"
+              v-model:EditEvalId="EditEvalId"
             />
           </div>
           <!-- 添加面授侧弹窗 -->
@@ -135,14 +136,16 @@
           </div>
           <!-- 添加案例侧弹窗 -->
           <div>
-            <add-case v-model:addcaseVisible="addcasevisible"
-             @changeData="updateTableData"
-             :isLevel="isLevel"
+            <add-case
+              v-model:addcaseVisible="addcasevisible"
+              @changeData="updateTableData"
+              :isLevel="isLevel"
               v-model:edit="edit"
-              v-model:projectId="projectId" 
+              v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
-               v-model:projectTaskId="projectTaskId"
-              v-model:EditCaseId="EditCaseId" />
+              v-model:projectTaskId="projectTaskId"
+              v-model:EditCaseId="EditCaseId"
+            />
           </div>
           <!-- 添加案例侧弹窗 -->
           <div class="lin"></div>
@@ -980,7 +983,7 @@ export default {
       chooseStageId: null,
       removeStageId: null,
       edit: false,
-      isLevel:2,//学习路径1项目2模板库3
+      isLevel: 2, //学习路径1项目2模板库3
       // isRefEdit: 1, //外链编辑
       // isLiveEdit: 1, //直播编辑
       isRefEdit: false, //外链编辑
@@ -992,9 +995,9 @@ export default {
       EditActiveId: null, //要编辑的活动id
       EditWorkId: null, // 要编辑的作业id
       EditTestId: null, // 要编辑的考试id
-      EditCaseId:null,//要编辑的案例id
-      EditOnlineId:null,//要编辑的在线id
-      EditFaceTeach:null,
+      EditCaseId: null, //要编辑的案例id
+      EditOnlineId: null, //要编辑的在线id
+      EditFaceTeach: null,
       EditEvalId: null,
       EditInvistId: null,
       EditVoteId: null, //编辑需要投票的id
@@ -1037,6 +1040,8 @@ export default {
       //阶段数据
       level: [],
 
+      projectTitle: null,
+      picUrl: null,
       //任务数据
       tableData: [],
       drawertableData: [
@@ -1251,7 +1256,7 @@ export default {
           tit: value.name,
           name: value.remark,
           taskList: value.taskList,
-          value: value.name,
+          value: value.stageId,
           label: value.name,
         };
         array.push(obj);
@@ -1400,6 +1405,8 @@ export default {
           if (res.status == 200) {
             console.log("22222", res.data.data.stageList);
             // console.log("22222", res.data.data.stageList);
+            state.projectTitle = res.data.data.projectInfo.name;
+            state.picUrl = res.data.data.projectInfo.picUrl;
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               // let stage = localStorage.getItem("stageId")
@@ -1643,12 +1650,12 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddInvist = (id, eleId) => {
-      console.log(id, eleId, '213312');
+      console.log(id, eleId, "213312");
       state.addinvistvisible = true;
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
-      console.log(id, eleId, '95835325932953295325');
+      console.log(id, eleId, "95835325932953295325");
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index cd27de75..26559cac 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3,12 +3,12 @@
   <div class="taskpage">
     <div class="addhead" style="flex-shrink: 0">
       <div class="leftimg">
-        <img class="img" src="../../assets/images/projectadd/picture.png" />
+        <img class="img" :src="picUrl" />
       </div>
       <div class="imgfor">
-        <div class="forz">管理者进阶-腾飞班</div>
-        <div class="fort">项目经理：黄华、刘俊</div>
-        <div class="fort">起止时间：2022-07-21 00:00至2022-10-21 00:00</div>
+        <div class="forz">{{ name }}</div>
+        <div class="fort">项目经理：{{ manager }}</div>
+        <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
       </div>
       <div class="right">
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
@@ -2973,8 +2973,8 @@ export default {
       }).then((res) => {
         console.log("get task", res.data.data);
         let info = res.data.data.projectInfo;
-        let start = toDate(info.beginTime / 1000, "Y-M-D");
-        let end = toDate(info.endTime / 1000, "Y-M-D");
+        let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
+        let end = toDate(info.endTime / 1000, "Y-M-D h:m");
         state.parentId = info.parentId;
         state.name = info.name;
         state.startTime = start;

From f1692b0669885cd400c807c6652222d81a641ec1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 16 Nov 2022 11:45:17 +0800
Subject: [PATCH 51/90] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E7=9C=8B=E5=8F=8A=E5=AD=A6=E4=B9=A0=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                       |   12 +-
 src/views/learningpath/LearningPath.vue   |  104 +-
 src/views/projectcenter/ClassAdd.vue      | 1991 +++++++++++----------
 src/views/projectcenter/ProjectAdd.vue    |   20 +-
 src/views/projectcenter/ProjectManage.vue |  125 +-
 src/views/projectcenter/SonProject.vue    |   27 +-
 6 files changed, 1273 insertions(+), 1006 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 74803f23..c2134c99 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,12 @@
-import { createRouter, createWebHashHistory } from 'vue-router';
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-16 09:56:16
+ * @FilePath: /fe-manage/src/router/index.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { createRouter,createWebHistory } from 'vue-router';
 import routesConfig from './config';
 console.log('routesConfig', routesConfig)
 
@@ -12,7 +20,7 @@ const routes = [
 ]
 
 const router = createRouter({
-	history: createWebHashHistory(),
+	history: createWebHistory(),
 	routes
 })
 
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 0221c0fe..6246c580 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -40,11 +40,11 @@
         <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1" @click="searchLearnPath">
             <div class="search"></div>
-            <div class="btnText" >搜索</div>
+            <div class="btnText">搜索</div>
           </div>
           <div class="btnn btn2" @click="resetLearnPath">
             <div class="search"></div>
-            <div class="btnText" >重置</div>
+            <div class="btnText">重置</div>
           </div>
         </div>
       </div>
@@ -196,7 +196,7 @@
                 @click="chooseImg(item)"
                 v-for="item in imgData"
                 :key="item.key"
-               class="learnBgItem"
+                class="learnBgItem"
                 :style="{
                   border:
                     learnPathBg === item.id
@@ -263,7 +263,7 @@
                 v-model:value="pathName"
                 maxlength="20"
                 style="border-radius: 4px"
-                 placeholder="请输入学习路径名称"
+                placeholder="请输入学习路径名称"
               />
               <div class="showcount">{{ pathName.length }}/20</div>
             </div>
@@ -430,11 +430,11 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="delete_exit">
-              <div class="btnText" >取消</div>
+            <div class="del_btn btn1" @click="closeCopyModal">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2" @click="delete_exit">
-              <div class="btnText" >确定</div>
+            <div class="del_btn btn2" @click="copyLearnPath">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -465,16 +465,16 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeStopModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="stopLearnPath">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
       </div>
     </a-modal>
-    <!-- 结束路径弹窗 -->
+    <!-- 删除路径弹窗 -->
     <a-modal
       v-model:visible="deleteModal"
       :footer="null"
@@ -495,10 +495,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteLearnPath">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -525,10 +525,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="delete_exit">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="delete_exit">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -556,10 +556,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeBackModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallPath">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -724,6 +724,7 @@ export default {
       routeStudentsNum: 0,
       recallPathId: null, //撤回路径id
       stopPathId: null, //停用路径id
+      copyPathId: null, //复制路径iid
 
       lpLoading: false,
     });
@@ -816,12 +817,34 @@ export default {
     const closePub = () => {
       state.pub = false;
     };
+    //显示复制窗口
     const showCopyModal = () => {
       state.copyModal = true;
     };
+    //关闭复制窗口
     const closeCopyModal = () => {
       state.copyModal = false;
     };
+    //确认复制
+    const copyLearnPath = () => {
+      let obj = {
+        routerId: state.copyPathId,
+        type: 2,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("复制成功", res);
+          message.destroy();
+          message.success("复制成功");
+          state.copyModal = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("复制失败", err);
+        });
+    };
+
     //显示结束窗口
     const showStopModal = () => {
       state.stopModal = true;
@@ -1137,13 +1160,14 @@ export default {
                       >
                         <div
                           onClick={() => {
+                            state.copyPathId = text.record.id;
                             showCopyModal();
                           }}
                         >
                           复制
                         </div>
                       </a-select-option>
-                     
+
                       <a-select-option
                         value="删除"
                         label="删除"
@@ -1177,6 +1201,7 @@ export default {
                         >
                           <div
                             onClick={() => {
+                              state.copyPathId = text.record.id;
                               showCopyModal();
                             }}
                           >
@@ -1197,20 +1222,20 @@ export default {
                             撤回
                           </div>
                         </a-select-option>
-                         <a-select-option
-                        value="结束"
-                        label="结束"
-                        style="padding-left:35px"
-                      >
-                        <div
-                          onClick={() => {
-                            state.stopPathId = text.record.id;
-                            showStopModal();
-                          }}
+                        <a-select-option
+                          value="结束"
+                          label="结束"
+                          style="padding-left:35px"
                         >
-                          结束
-                        </div>
-                      </a-select-option>
+                          <div
+                            onClick={() => {
+                              state.stopPathId = text.record.id;
+                              showStopModal();
+                            }}
+                          >
+                            结束
+                          </div>
+                        </a-select-option>
                       </a-select>
                     </div>
                   ) : (
@@ -1230,6 +1255,7 @@ export default {
                         >
                           <div
                             onClick={() => {
+                              state.copyPathId = text.record.id;
                               showCopyModal();
                             }}
                           >
@@ -1322,7 +1348,7 @@ export default {
                 state.lpLoading = false;
                 state.currentPage = 1;
                 router.push("/leveladd");
-                 storage.set("routerId", res.data.data.routerId);
+                storage.set("routerId", res.data.data.routerId);
                 // getLearnPath();
               }, commonData.timeout);
             })
@@ -1491,6 +1517,7 @@ export default {
       closeCopyModal,
       showStopModal,
       closeStopModal,
+      copyLearnPath,
       stopLearnPath,
       showDeleteModal,
       closeDeleteModal,
@@ -1645,20 +1672,19 @@ export default {
                   cursor: pointer;
                 }
               }
-              .learnBg{
+              .learnBg {
                 display: flex;
                 flex-wrap: wrap;
                 min-height: 110px;
-              .learnBgItem{
-                 border-radius: 8px;
+                .learnBgItem {
+                  border-radius: 8px;
                   width: 136px;
                   height: 106px;
                   background-size: 100%;
                   background-repeat: no-repeat;
-                   margin-bottom: 20px;
-                     margin-right: 6px;
-              }
-               
+                  margin-bottom: 20px;
+                  margin-right: 6px;
+                }
               }
             }
             .info {
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 369f8e5f..1dd9ddc0 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -1,55 +1,89 @@
 <!---- 创建班级页面 --->
 <template>
-	<div class="projectAdd">
-		<div class="header">
-			<span class="title">创建/编辑班级</span>
-			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
-				<span class="return"></span><span class="returntext">返回</span>
-			</div>
-		</div>
-		<div class="content">
-			<div class="main">
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目归属</div>
-					</div>
-					<div class="in">
-						<div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
-							{{ projectAscription }}
-						</div>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">班级名称</div>
-					</div>
-					<div class="in">
-						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">分类</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-							@change="classificationChange" allowClear showSearch>
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">封面图</div>
-					</div>
-					<div class="box" style="
+  <div class="projectAdd">
+    <div class="header">
+      <span class="title">创建/编辑班级</span>
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
+      >
+        <span class="return"></span><span class="returntext">返回</span>
+      </div>
+    </div>
+    <div class="content">
+      <div class="main">
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目归属</div>
+          </div>
+          <div class="in">
+            <div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
+              {{ projectAscription }}
+            </div>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">班级名称</div>
+          </div>
+          <div class="in">
+            <a-input
+              v-model:value="projectName"
+              placeholder="请输入项目名称"
+              show-count
+              :maxlength="30"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">分类</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect"
+              placeholder="四个养成"
+              style="width: 100%"
+              :options="classifyList"
+              @change="classificationChange"
+              allowClear
+              showSearch
+              :disabled="viewDetail ? true : false"
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">封面图</div>
+          </div>
+          <div
+            class="box"
+            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -57,128 +91,218 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            ">
-						<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 style="
+            "
+          >
+            <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"
+              :disabled="viewDetail ? true : false"
+            >
+              <img
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                " 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="box1"></div>
-								<div class="box2"></div>
-								<!-- <div class="ant-upload-text"></div> -->
-							</div>
-						</a-upload>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">子项目时间</div>
-					</div>
+                "
+                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="box1"></div>
+                <div class="box2"></div>
+                <!-- <div class="ant-upload-text"></div> -->
+              </div>
+            </a-upload>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">子项目时间</div>
+          </div>
 
-					<div class="in">
-						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
-							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">子项目经理</div>
-					</div>
-					<div class="in">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-							@change="classificationChange1" allowClear showSearch>
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">资源归属</div>
-					</div>
+          <div class="in">
+            <a-range-picker
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="rangevalue"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              @change="onRangeChange"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">子项目经理</div>
+          </div>
+          <div class="in">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              :value="classifySelect1"
+              mode="multiple"
+              placeholder="请选择项目经理"
+              style="width: 100%"
+              :options="classifyList1"
+              @change="classificationChange1"
+              allowClear
+              showSearch
+              :disabled="viewDetail ? true : false"
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">资源归属</div>
+          </div>
 
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
-							@change="classificationChange2" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname" style="margin-top: 13px">项目说明</div>
-					</div>
-					<div class="in">
-						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname">同步学习记录</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              placeholder="自动带出 可修改"
+              :options="classifyList2"
+              @change="classificationChange2"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">项目说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-radio
+              @click="changeChecked"
+              v-model:checked="checked"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目级别</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
-							placeholder="集团级/组织级/现地级/部门级" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">培训体系</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
-							placeholder="集团级/组织级/现地级/部门级" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">是否BOEU实施</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect3"
+              :options="classifyList3"
+              @change="classificationChange3"
+              placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训体系</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect4"
+              :options="classifyList4"
+              @change="classificationChange4"
+              placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio
+              @click="changeChecked1"
+              v-model:checked="checked1"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">BOEU实施</span></a-radio>
-					</div>
-				</div>
-				<!-- <div class="name name2">
+                "
+                >BOEU实施</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <!-- <div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">附件</div>
@@ -197,864 +321,887 @@
 						</div>
 					</div>
 				</div> -->
-			</div>
-			<div class="template">
-				<div class="name">
-					<div class="inname" style="width: 50px">模版</div>
-					<div class="in select" style="margin-left: 2px">
-						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-						<a-select v-else :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="footer">
-			<div class="btn">
-				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-				<a-button @click="backPage" class="btn2">取消</a-button>
-			</div>
-		</div>
-	</div>
+      </div>
+      <div class="template">
+        <div class="name">
+          <div class="inname" style="width: 50px">模版</div>
+          <div class="in select" style="margin-left: 2px">
+            <a-select
+              v-if="isEdit"
+              disabled="true"
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+            <a-select
+              v-else
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <div class="btn">
+        <a-button v-on:click="createProject" type="primary" class="btn1"
+          >确定</a-button
+        >
+        <a-button @click="backPage" class="btn2">取消</a-button>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import * as api from "../../api/index";
-import { toDate } from '../../api/method'
+import { toDate } from "../../api/method";
 
 export default {
-	name: "projectAdd",
-	setup() {
-		// 编辑页面跳转过来时候，自动填充表格
-		const routers = useRoute();
-		const router = useRouter();
-		const isEdit = ref(false);
-		let peojectID = "";
-		let paraentID = "";
+  name: "projectAdd",
+  setup() {
+    // 编辑页面跳转过来时候，自动填充表格
+    const routers = useRoute();
+    const router = useRouter();
+    const isEdit = ref(false);
+    let peojectID = "";
+    let paraentID = "";
 
-		const state = reactive({
-			classifySelect: null,
-			classifySelectId: null,
-			checked: false,
-			checked1: false,
-			valueE: null,
-			valueE1: null,
-			valueE2: null,
-			classifySelect1: [],
-			classifySelect2: [],
-			classifySelect3: [],
-			classifySelect4: [],
-			rangevalue: [],
-			projectAscription: "",
-		});
+    const state = reactive({
+      classifySelect: null,
+      classifySelectId: null,
+      checked: false,
+      checked1: false,
+      valueE: null,
+      valueE1: null,
+      valueE2: null,
+      classifySelect1: [],
+      classifySelect2: [],
+      classifySelect3: [],
+      classifySelect4: [],
+      rangevalue: [],
+      projectAscription: "",
+      viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+    });
 
-		if (routers.query.name==undefined) {
-			router.push({
-					path: "/projectmanage"
-				});
-		}
+    if (routers.query.name == undefined) {
+      router.push({
+        path: "/projectmanage",
+      });
+    }
 
-		peojectID = routers.query.projectId;
-		state.projectAscription = routers.query.name;
+    peojectID = routers.query.projectId;
+    state.projectAscription = routers.query.name;
 
-		if (routers.query.edit!==undefined) {
-			isEdit.value = true;
-			// 需要编辑
-			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
-				if (res.status == 200 && res.data.code == 200) {
-					let info = res.data.data.projectInfo;
-					console.log(info)
-					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-					projectName.value = info.name;
-					state.classifySelect = classifyList.value[1]; // info.category
-					imageUrl.value = info.picUrl;
+    if (routers.query.edit !== undefined) {
+      isEdit.value = true;
+      // 需要编辑
+      api
+        .getProjectDetail({ projectId: routers.query.projectId })
+        .then((res) => {
+          if (res.status == 200 && res.data.code == 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
 
-					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
-					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
-					state.rangevalue = [
-						dayjs(start, 'YYYY/MM/DD'),
-						dayjs(end, 'YYYY/MM/DD'),
-					];
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
 
-					let manageName = info.manager.split(",");
-					let manageValue = info.managerId.split(",");
-					let optionsManage = []
-					for (let i = 0; i < manageName.length; i++) {
-						let obj = {
-							label: manageName[i],
-							value: manageValue[i]
-						}
-						optionsManage.push(obj)
-					}
-					console.log(optionsManage)
-					state.classifySelect1 = optionsManage;
-					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
-					remark.value = info.remark;
-					state.checked = info.boeFlag ? info.boeFlag : false;
-					state.classifySelect3 = classifyList3.value[info.level];
-					state.classifySelect4 = classifyList4.value[info.systemId - 1];
-					state.checked1 = info.boeFlag ? info.boeFlag : false;
-					// fileList1.value = info.attach.split(",");
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
 
-					projectType = 1;
-					picUrl  = info.picUrl; 
-					beginTime = Number(info.beginTime/1000);
-					endTime   = Number(info.endTime/1000);
-					manager   = info.manager;
-					managerId  = info.managerId;
-					sourceBelongIdC  = Number(info.sourceBelongId);
-					courseSyncFlag  = info.courseSyncFlag; 
-					levels  = info.level;
-					systemid = info.systemId;
-					boeFlag = info.boeFlag;
-					paraentID = Number(info.parentId);
-				}
-			}).catch(err => { console.log(err) })
-		} else {
-			paraentID = Number(routers.query.projectId);
-		}
-		
-		const backPage = () => {
-			setTimeout(() => {
-				router.push({
-					path: "/projectmanage"
-				});
-			}, 400);
-		}
-		
-		
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+            paraentID = Number(info.parentId);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    } else {
+      paraentID = Number(routers.query.projectId);
+    }
 
-		const projectName = ref("");
+    const backPage = () => {
+      setTimeout(() => {
+        router.push({
+          path: "/projectmanage",
+        });
+      }, 400);
+    };
 
-		const classifyList = ref([
-			{ value: 1, label: "管理者" },
-			{ value: 2, label: "领军者" },
-			{ value: 3, label: "产业人" },
-		]);
+    const projectName = ref("");
 
-		let projectType = "";
+    const classifyList = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
 
-		const classificationChange = (value) => {
-			console.log(`selected ${value}`);
-			projectType = value;
-		};
+    let projectType = "";
 
-		function getBase64(img, callback) {
-			const reader = new FileReader();
-			reader.addEventListener("load", () => callback(reader.result));
-			reader.readAsDataURL(img);
-		}
+    const classificationChange = (value) => {
+      console.log(`selected ${value}`);
+      projectType = value;
+    };
 
-		const fileList = ref([]);
-		const fileList1 = ref([]);
-		const loading = ref(false);
-		const imageUrl = ref("");
-		let picUrl = "";
+    function getBase64(img, callback) {
+      const reader = new FileReader();
+      reader.addEventListener("load", () => callback(reader.result));
+      reader.readAsDataURL(img);
+    }
 
-		const handleChange = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log("上传图片返回的信息 %o", info);
-				picUrl = info.file.response.data;
-				// Get this url from response in real world.
-				getBase64(info.file.originFileObj, (base64Url) => {
-					imageUrl.value = base64Url;
-					loading.value = false;
-				});
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+    const fileList = ref([]);
+    const fileList1 = ref([]);
+    const loading = ref(false);
+    const imageUrl = ref("");
+    let picUrl = "";
 
-		let uplodaFileCount = false;
+    const handleChange = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log("上传图片返回的信息 %o", info);
+        picUrl = info.file.response.data;
+        // Get this url from response in real world.
+        getBase64(info.file.originFileObj, (base64Url) => {
+          imageUrl.value = base64Url;
+          loading.value = false;
+        });
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		let attach = "";
-		let attachData = "";
-		const handleChange1 = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log(
-					"上传附件返回的信息 %o",
-					info,
-					info.fileList.length,
-					uplodaFileCount
-				);
+    let uplodaFileCount = false;
 
-				let attachStr = "";
-				attachData = info.fileList;
-				for (let i = 0; i < attachData.length; i++) {
-					if (attachData.length - 1 == i) {
-						attachStr += attachData[i].response.data;
-					} else {
-						attachStr += attachData[i].response.data + ",";
-					}
-				}
-				console.log(attachStr);
-				attach = attachStr;
+    let attach = "";
+    let attachData = "";
+    const handleChange1 = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log(
+          "上传附件返回的信息 %o",
+          info,
+          info.fileList.length,
+          uplodaFileCount
+        );
 
-				if (info.fileList.length > 5) {
-					uplodaFileCount = true;
-				} else {
-					uplodaFileCount = false;
-				}
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+        let attachStr = "";
+        attachData = info.fileList;
+        for (let i = 0; i < attachData.length; i++) {
+          if (attachData.length - 1 == i) {
+            attachStr += attachData[i].response.data;
+          } else {
+            attachStr += attachData[i].response.data + ",";
+          }
+        }
+        console.log(attachStr);
+        attach = attachStr;
 
-		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;
-		};
+        if (info.fileList.length > 5) {
+          uplodaFileCount = true;
+        } else {
+          uplodaFileCount = false;
+        }
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		const beforeUpload1 = () => {
-			return new Promise((resovle, reject) => {
-				if (uplodaFileCount) {
-					message.info("上传文件数量已达最大数量");
-					return reject(false);
-				}
-				return resovle(true);
-			});
-		};
+    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;
+    };
 
-		let beginTime = "";
-		let endTime = "";
-		const dateFormatList = ['YYYY/MM/DD'];
+    const beforeUpload1 = () => {
+      return new Promise((resovle, reject) => {
+        if (uplodaFileCount) {
+          message.info("上传文件数量已达最大数量");
+          return reject(false);
+        }
+        return resovle(true);
+      });
+    };
 
-		const onRangeChange = (value, dateString) => {
-			console.log("Selected Time: ", value);
-			// 项目时间选择函数
-			console.log("Formatted Selected Time: ", dateString);
-			console.log(
-				"Formatted Selected TimeStamp",
-				new Date(dateString[0]).getTime()
-			);
-			beginTime = new Date(dateString[0]).getTime() / 1000;
-			endTime = new Date(dateString[1]).getTime() / 1000;
-		};
+    let beginTime = "";
+    let endTime = "";
+    const dateFormatList = ["YYYY/MM/DD"];
 
-		// 项目经理 后续接口调用
-		const classifyList1 = ref([
-			{ value: 1, label: "李俊国" },
-			{ value: 2, label: "将小米" },
-			{ value: 3, label: "刘孟君" },
-		]);
+    const onRangeChange = (value, dateString) => {
+      console.log("Selected Time: ", value);
+      // 项目时间选择函数
+      console.log("Formatted Selected Time: ", dateString);
+      console.log(
+        "Formatted Selected TimeStamp",
+        new Date(dateString[0]).getTime()
+      );
+      beginTime = new Date(dateString[0]).getTime() / 1000;
+      endTime = new Date(dateString[1]).getTime() / 1000;
+    };
 
-		let manager = "";
-		let managerId = "";
-		const classificationChange1 = (key, options) => {
-			console.log(`selected ${key}`, options);
-			let mstr = "";
-			let midstr = "";
-			for (let i = 0; i < key.length; i++) {
-				if (key.length - 1 !== i) {
-					midstr += key[i] + ",";
-					mstr += classifyList1.value[i].label + ",";
-				} else {
-					midstr += key[i];
-					mstr += classifyList1.value[i].label;
-				}
-			}
-			console.log(mstr, midstr);
-			state.classifySelect1 = options;
-			let newoptions = [];
-			for (let i = 0; i < state.classifySelect1.length; i++) {
-				if (state.classifySelect1[i].value) {
-					newoptions.push(state.classifySelect1[i])
-				}
-			}
-			state.classifySelect1 = newoptions;
-			manager = mstr;
-			managerId = midstr;
-		};
+    // 项目经理 后续接口调用
+    const classifyList1 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
 
-		// 资源归属 sourceBelongId 后续给接口
-		const classifyList2 = ref([
-			{ value: 1, label: "项目一" },
-			{ value: 2, label: "项目二" },
-			{ value: 3, label: "项目三" },
-		]);
+    let manager = "";
+    let managerId = "";
+    const classificationChange1 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      state.classifySelect1 = options;
+      let newoptions = [];
+      for (let i = 0; i < state.classifySelect1.length; i++) {
+        if (state.classifySelect1[i].value) {
+          newoptions.push(state.classifySelect1[i]);
+        }
+      }
+      state.classifySelect1 = newoptions;
+      manager = mstr;
+      managerId = midstr;
+    };
 
-		let sourceBelongIdC = '';
-		const classificationChange2 = (key) => {
-			console.log(`selected ${key}`, classifyList2);
-			sourceBelongIdC = key;
-		};
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList2 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
 
-		// 项目级别
-		const classifyList3 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let sourceBelongIdC = "";
+    const classificationChange2 = (key) => {
+      console.log(`selected ${key}`, classifyList2);
+      sourceBelongIdC = key;
+    };
 
-		let levels = "";
-		const classificationChange3 = (key) => {
-			console.log(`selected ${key}`, classifyList3);
-			levels = key;
-		};
+    // 项目级别
+    const classifyList3 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 培训体系
-		const classifyList4 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let levels = "";
+    const classificationChange3 = (key) => {
+      console.log(`selected ${key}`, classifyList3);
+      levels = key;
+    };
 
-		let systemid = "";
-		const classificationChange4 = (key) => {
-			console.log(`selected ${key}`, classifyList4);
-			systemid = key;
-		};
+    // 培训体系
+    const classifyList4 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 模版
-		const classifyList5 = ref([
-			{ value: 1, label: "模版一" },
-			{ value: 2, label: "模版二" },
-			{ value: 3, label: "模版三" },
-			{ value: 4, label: "模版四" },
-		]);
-		const classificationChange5 = (key) => {
-			console.log(`selected ${key}`, classifyList5);
-		};
+    let systemid = "";
+    const classificationChange4 = (key) => {
+      console.log(`selected ${key}`, classifyList4);
+      systemid = key;
+    };
 
-		// 项目说明
-		const remark = ref("");
+    // 模版
+    const classifyList5 = ref([
+      { value: 1, label: "模版一" },
+      { value: 2, label: "模版二" },
+      { value: 3, label: "模版三" },
+      { value: 4, label: "模版四" },
+    ]);
+    const classificationChange5 = (key) => {
+      console.log(`selected ${key}`, classifyList5);
+    };
 
-		let courseSyncFlag = 0;
-		const changeChecked = () => {
-			console.log(state.checked);
-			state.checked ? (state.checked = false) : (state.checked = true);
-			courseSyncFlag = state.checked ? 1 : 0;
-		};
+    // 项目说明
+    const remark = ref("");
 
-		let boeFlag = 0;
-		const changeChecked1 = () => {
-			console.log(state.checked1);
-			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-			boeFlag = state.checked1 ? 1 : 0;
-		};
+    let courseSyncFlag = 0;
+    const changeChecked = () => {
+      console.log(state.checked);
+      state.checked ? (state.checked = false) : (state.checked = true);
+      courseSyncFlag = state.checked ? 1 : 0;
+    };
 
-		const removeFile = (file) => {
-			const index = fileList1.value.indexOf(file);
-			const newFileList = fileList1.value.slice();
-			newFileList.splice(index, 1);
-			fileList1.value = newFileList;
+    let boeFlag = 0;
+    const changeChecked1 = () => {
+      console.log(state.checked1);
+      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+      boeFlag = state.checked1 ? 1 : 0;
+    };
 
-			let attachStr = "";
-			if (newFileList.length == 0) {
-				attachStr = "";
-			}
-			for (let i = 0; i < fileList1["value"].length; i++) {
-				console.log(fileList1["value"][i].response.data);
-				if (fileList1["value"].length - 1 == i) {
-					attachStr += fileList1["value"][i].response.data;
-				} else {
-					attachStr += fileList1["value"][i].response.data + ",";
-				}
-			}
-			attach = attachStr;
-		};
+    const removeFile = (file) => {
+      const index = fileList1.value.indexOf(file);
+      const newFileList = fileList1.value.slice();
+      newFileList.splice(index, 1);
+      fileList1.value = newFileList;
 
-		const errorMsgs = {
-			name: "请输入项目名称",
-			category: "请选择项目分类",
-			picUrl: "请上传项目封面图",
-			beginTime: "请选择项目开始时间",
-			endTime: "请选择项目结束时间",
-			manager: "请选择项目经理",
-			managerId: "请选择项目经理",
-			sourceBelongId: "请选择资源归属",
-			level: "请填写项目级别",
-			systemId: "请填写项目培训体系",
-			boeFlag: "请选择是否BOE实施"
-		};
-		
-		const createProject = () => {
-			console.log('我是否要编辑项目', isEdit.value)
-			if (isEdit.value) {
-				console.log('我要编辑项目', peojectID)
-				let obj = {
-					projectId: Number(peojectID),
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 0,
-					parentId: paraentID,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
+      let attachStr = "";
+      if (newFileList.length == 0) {
+        attachStr = "";
+      }
+      for (let i = 0; i < fileList1["value"].length; i++) {
+        console.log(fileList1["value"][i].response.data);
+        if (fileList1["value"].length - 1 == i) {
+          attachStr += fileList1["value"][i].response.data;
+        } else {
+          attachStr += fileList1["value"][i].response.data + ",";
+        }
+      }
+      attach = attachStr;
+    };
 
-				console.log(obj);
+    const errorMsgs = {
+      name: "请输入项目名称",
+      category: "请选择项目分类",
+      picUrl: "请上传项目封面图",
+      beginTime: "请选择项目开始时间",
+      endTime: "请选择项目结束时间",
+      manager: "请选择项目经理",
+      managerId: "请选择项目经理",
+      sourceBelongId: "请选择资源归属",
+      level: "请填写项目级别",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOE实施",
+    };
 
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+    const createProject = () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      if (isEdit.value) {
+        console.log("我要编辑项目", peojectID);
+        let obj = {
+          projectId: Number(peojectID),
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 0,
+          parentId: paraentID,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("编辑成功");
-							setTimeout(() => {
-								router.push({
-									path: "/projectmanage"
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("编辑失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("编辑失败，请检查当前网络状态。");
-					});
+        console.log(obj);
 
-			} else {
-				let obj = {
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 10,
-					parentId: paraentID,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
-				console.log("提交的数据格式 %o", obj);
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("创建成功");
-							setTimeout(() => {
-								router.push({
-									path: "/taskpage",
-									query: { id: res.data.data.projectId },
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("创建失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("创建失败，请检查当前网络状态。");
-					});
-			}
-		};
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("编辑成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/projectmanage",
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("编辑失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("编辑失败，请检查当前网络状态。");
+          });
+      } else {
+        let obj = {
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 10,
+          parentId: paraentID,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
+        console.log("提交的数据格式 %o", obj);
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
 
-		return {
-			...toRefs(state),
-			projectName,
-			classifyList,
-			classificationChange,
-			classificationChange1,
-			classificationChange2,
-			classificationChange3,
-			classificationChange4,
-			classificationChange5,
-			fileList,
-			fileList1,
-			loading,
-			imageUrl,
-			handleChange,
-			handleChange1,
-			beforeUpload,
-			beforeUpload1,
-			onRangeChange,
-			classifyList1,
-			classifyList2,
-			classifyList3,
-			classifyList4,
-			classifyList5,
-			remark,
-			changeChecked,
-			changeChecked1,
-			uplodaFileCount,
-			createProject,
-			removeFile,
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("创建成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/taskpage",
+                  query: { id: res.data.data.projectId },
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("创建失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("创建失败，请检查当前网络状态。");
+          });
+      }
+    };
 
-			isEdit,
-			backPage,
-			dateFormatList,
-		};
-	},
+    return {
+      ...toRefs(state),
+      projectName,
+      classifyList,
+      classificationChange,
+      classificationChange1,
+      classificationChange2,
+      classificationChange3,
+      classificationChange4,
+      classificationChange5,
+      fileList,
+      fileList1,
+      loading,
+      imageUrl,
+      handleChange,
+      handleChange1,
+      beforeUpload,
+      beforeUpload1,
+      onRangeChange,
+      classifyList1,
+      classifyList2,
+      classifyList3,
+      classifyList4,
+      classifyList5,
+      remark,
+      changeChecked,
+      changeChecked1,
+      uplodaFileCount,
+      createProject,
+      removeFile,
+
+      isEdit,
+      backPage,
+      dateFormatList,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .projectAdd {
-	width: 100%;
-	// height: inherit;
-	// flex: 1;
-	// flex-shrink: 0;
-	// overflow-y: auto;
+  width: 100%;
+  // height: inherit;
+  // flex: 1;
+  // flex-shrink: 0;
+  // overflow-y: auto;
 
-	.header {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
+  .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;
-		}
+    .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;
+    .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");
-			}
+      .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;
-			}
-		}
-	}
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
 
-	// 修改 antd upload 样式
-	.ant-upload {
-		border-width: 0px;
-	}
+  // 修改 antd upload 样式
+  .ant-upload {
+    border-width: 0px;
+  }
 
-	.content {
-		display: flex;
+  .content {
+    display: flex;
 
-		.main {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: left;
-			border-right: 1px solid rgba(153, 155, 163, 0.3);
+    .main {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: left;
+      border-right: 1px solid rgba(153, 155, 163, 0.3);
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
+      .name {
+        width: 78%;
+        // 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;
+        //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;
-					}
-				}
+          .nameimg {
+            width: 10px;
+            height: 10px;
+          }
+        }
 
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.box {
-					position: relative;
-					margin-left: 14px;
+        .box {
+          position: relative;
+          margin-left: 14px;
 
-					.box1 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						width: 50px;
-						margin-left: -25px;
-						margin-top: -5px;
-						border-top: 2px solid rgba(78, 166, 255, 1);
-					}
+          .box1 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            margin-left: -25px;
+            margin-top: -5px;
+            border-top: 2px solid rgba(78, 166, 255, 1);
+          }
 
-					.box2 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						height: 50px;
-						//margin-left: -5px;
-						margin-top: -25px;
-						border-left: 2px solid rgba(78, 166, 255, 1);
-					}
-				}
+          .box2 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 50px;
+            //margin-left: -5px;
+            margin-top: -25px;
+            border-left: 2px solid rgba(78, 166, 255, 1);
+          }
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+        }
 
-				.in {
-					margin-left: 14px;
-					flex: 1;
+        .in {
+          margin-left: 14px;
+          flex: 1;
 
-					// .ant-radio-wrapper {
-					// }
-					.ant-input-textarea-show-count {
-						position: relative;
-						height: 88px;
-					}
+          // .ant-radio-wrapper {
+          // }
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
 
-					.ant-input-textarea-show-count::after {
-						position: absolute;
-						right: 10px;
-						bottom: 0px;
-					}
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 0px;
+          }
 
-					.ant-input {
-						border-radius: 8px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 8px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-input-affix-wrapper {
-						padding: 0 11px;
-						border-radius: 8px;
-					}
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
 
-				.filebox {
-					margin-left: 14px;
-					flex: 1;
+        .filebox {
+          margin-left: 14px;
+          flex: 1;
 
-					.fileimg {
-						width: 15px;
-						height: 15px;
-						margin-right: 6px;
-					}
+          .fileimg {
+            width: 15px;
+            height: 15px;
+            margin-right: 6px;
+          }
 
-					.filetext {
-						font-size: 14px;
-						font-weight: 400;
-						color: #4ea6ff;
-						line-height: 36px;
-					}
+          .filetext {
+            font-size: 14px;
+            font-weight: 400;
+            color: #4ea6ff;
+            line-height: 36px;
+          }
 
-					.support {
-						font-size: 14px;
-						font-weight: 400;
-						color: #999ba3;
-						line-height: 36px;
-						margin-top: 8px;
-						word-break: break-all;
-					}
-				}
-			}
+          .support {
+            font-size: 14px;
+            font-weight: 400;
+            color: #999ba3;
+            line-height: 36px;
+            margin-top: 8px;
+            word-break: break-all;
+          }
+        }
+      }
 
-			.name2 {
-				display: flex;
-				align-items: flex-start;
+      .name2 {
+        display: flex;
+        align-items: flex-start;
 
-				.ant-input-textarea {
-					.ant-input {
-						height: 88px;
-					}
-				}
-			}
-		}
+        .ant-input-textarea {
+          .ant-input {
+            height: 88px;
+          }
+        }
+      }
+    }
 
-		.template {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: right;
+    .template {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: right;
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
-				height: 40px;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        height: 40px;
 
-				// border: 1px solid black;
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        // border: 1px solid black;
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-					width: 65px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+          width: 65px;
+        }
 
-				.in {
-					margin-left: 14px;
-					width: 81%;
+        .in {
+          margin-left: 14px;
+          width: 81%;
 
-					.ant-input {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
-			}
-		}
-	}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
+      }
+    }
+  }
 
-	.footer {
-		width: 100%;
-		margin-top: 31px;
-		margin-bottom: 14px;
-		padding-bottom: 20px;
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    padding-bottom: 20px;
 
-		.btn {
-			display: flex;
-			justify-content: center;
+    .btn {
+      display: flex;
+      justify-content: center;
 
-			.btn1 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				background: #409eff;
-				color: #ffffff;
-				margin-right: 14px;
-			}
+      .btn1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        background: #409eff;
+        color: #ffffff;
+        margin-right: 14px;
+      }
 
-			.btn2 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				border: 1px solid #409eff;
-				background: #ffffff;
-				color: #409eff;
-			}
-		}
+      .btn2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        border: 1px solid #409eff;
+        background: #ffffff;
+        color: #409eff;
+      }
+    }
 
-		.text {
-			color: rgba(153, 155, 163, 1);
-			font-size: 14px;
-			margin-left: 223px;
-		}
-	}
+    .text {
+      color: rgba(153, 155, 163, 1);
+      font-size: 14px;
+      margin-left: 223px;
+    }
+  }
 }
 </style>
 
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 9d48e5f9..deb832c8 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -28,6 +28,7 @@
               placeholder="请输入项目名称"
               show-count
               :maxlength="30"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -53,6 +54,7 @@
               @change="classificationChange"
               allowClear
               showSearch
+              :disabled="viewDetail ? true : false"
             >
             </a-select>
           </div>
@@ -86,6 +88,7 @@
               action="/api/file/upload"
               :before-upload="beforeUpload"
               @change="handleChange"
+              :disabled="viewDetail ? true : false"
             >
               <img
                 style="
@@ -124,6 +127,7 @@
               v-model:value="rangevalue"
               style="width: 100%; height: 40px; border-radius: 5px"
               @change="onRangeChange"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -150,6 +154,7 @@
               @change="classificationChange1"
               allowClear
               showSearch
+              :disabled="viewDetail ? true : false"
             >
             </a-select>
           </div>
@@ -174,6 +179,7 @@
               placeholder="自动带出 可修改"
               :options="classifyList2"
               @change="classificationChange2"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -188,6 +194,7 @@
               placeholder="请输入说明"
               show-count
               :maxlength="200"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -196,7 +203,10 @@
             <div class="inname">同步学习记录</div>
           </div>
           <div class="in">
-            <a-radio @click="changeChecked" v-model:checked="checked"
+            <a-radio
+              @click="changeChecked"
+              v-model:checked="checked"
+              :disabled="viewDetail ? true : false"
               ><span
                 style="
                   width: 100%;
@@ -227,6 +237,7 @@
               :options="classifyList3"
               @change="classificationChange3"
               placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -249,6 +260,7 @@
               :options="classifyList4"
               @change="classificationChange4"
               placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -261,7 +273,10 @@
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-radio @click="changeChecked1" v-model:checked="checked1"
+            <a-radio
+              @click="changeChecked1"
+              v-model:checked="checked1"
+              :disabled="viewDetail ? true : false"
               ><span
                 style="
                   width: 100%;
@@ -509,6 +524,7 @@ export default {
       tableDataTotal: -1, //模版列表总数
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
+      viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
     });
 
     const projectName = ref("");
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 2f1873f2..b08b5620 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -816,10 +816,10 @@
             <span>您确定要复制此路径吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1" @click="delete_exit">
+            <div class="del_btn btn1" @click="closeCopyModal">
               <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2" @click="delete_exit">
+            <div class="del_btn btn2" @click="copyProject">
               <div class="btnText">确定</div>
             </div>
           </div>
@@ -1093,6 +1093,7 @@ export default {
       finishProjectId: null, //结束的项目id
       deleteProjectId: null, //删除的项目id
       templateProjectId: null, //存为模版的项目id
+      copyProjectId: null, //复制项目id
     });
     // 数据接入 - start -
     const router = useRouter();
@@ -1922,6 +1923,34 @@ export default {
     const closeStartModal = () => {
       state.startModal = false;
     };
+    //打开确认复制弹窗
+    const showCopyModal = (projectId) => {
+      state.copyModal = true;
+      state.copyProjectId = projectId;
+    };
+    //关闭确认复制弹窗
+    const closeCopyModal = () => {
+      state.copyModal = false;
+    };
+    //确认复制
+    const copyProject = () => {
+      let obj = {
+        projectId: state.copyProjectId,
+        type: 2,
+      };
+      api
+        .handleProject(obj)
+        .then((res) => {
+          console.log("复制成功", res);
+          message.destroy();
+          message.success("复制成功");
+          state.copyModal = false;
+          getTableDate();
+        })
+        .catch((err) => {
+          console.log("复制失败", err);
+        });
+    };
 
     // 数据接入 - end -
 
@@ -2119,7 +2148,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2190,7 +2219,7 @@ export default {
                 <span
                   class="operation3"
                   // onClick={() => {
-                  // 	showCopyModal();
+                  // 	showCopyModal(value.record.projectId);
                   // }}
                 ></span>
 
@@ -2217,7 +2246,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2279,7 +2308,7 @@ export default {
                 <span
                   class="operation3"
                   // onClick={() => {
-                  // 	showCopyModal();
+                  // 	showCopyModal(value.record.projectId);
                   // }}
                 ></span>
                 <div class="tableSelect">
@@ -2305,7 +2334,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2420,7 +2449,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2502,7 +2531,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2572,7 +2601,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2640,7 +2669,52 @@ export default {
                   编辑
                 </span>
               ) : (
-                <span class="operation1"></span>
+                 <span
+                  onClick={() => {
+                    console.log("单层子项目的编辑");
+                    console.log(value);
+
+                    {
+                      /* 判断是班级\单层项目\单层子项目 */
+                    }
+                    if (value.record.parentId == "0") {
+                      router.push({
+                        path: "/projectadd",
+                        query: {
+                          projectId: value.record.projectId,
+                          name: value.record.name,
+                           viewDetail:1,
+                        },
+                      });
+                    } else {
+                      if (value.record.isbj) {
+                        router.push({
+                          path: "/classadd",
+                          query: {
+                            projectId: value.record.projectId,
+                            name: value.record.paraentName,
+                            edit: 0,
+                            viewDetail:1,
+                          },
+                        });
+                      } else {
+                        router.push({
+                          path: "/sonproject",
+                          query: {
+                            projectId: value.record.projectId,
+                            name: value.record.paraentName,
+                            edit: 0,
+                            viewDetail:1,
+                          },
+                        });
+                      }
+                    }
+                  }}
+                  style="cursor:pointer;"
+                  class="operation1"
+                >
+                  查看
+                </span>
               )}
               <div class="tableSelect">
                 <a-select
@@ -2727,7 +2801,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2774,16 +2848,16 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal(value.record.projectId);
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
                     <a-select-option value="存为模版" label="存为模版">
-                      <a-select-option value="复制" label="复制">
-                        <div
-                          onClick={() => {
-                            showCopyModal();
-                          }}
-                        >
-                          复制
-                        </div>
-                      </a-select-option>
                       <div
                         onClick={() => {
                           showStartModal(value.record.projectId);
@@ -2842,7 +2916,7 @@ export default {
                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
-                          showCopyModal();
+                          showCopyModal(value.record.projectId);
                         }}
                       >
                         复制
@@ -2978,12 +3052,6 @@ export default {
       state.doublesonpro = true;
       state.sonproject = false;
     };
-    const showCopyModal = () => {
-      state.copyModal = true;
-    };
-    const closeCopyModal = () => {
-      state.copyModal = false;
-    };
 
     const showProjOwner = () => {
       state.ProjOwnervisible = true;
@@ -3098,6 +3166,7 @@ export default {
       finishProject,
       deleteProject,
       templateProject,
+      copyProject,
     };
   },
 };
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 040370df..be713def 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -26,7 +26,7 @@
 						<div class="inname">子项目名称</div>
 					</div>
 					<div class="in">
-						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" :disabled="viewDetail ? true : false" />
 					</div>
 				</div>
 				<div class="name">
@@ -40,7 +40,7 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-							@change="classificationChange" allowClear showSearch>
+							@change="classificationChange" allowClear showSearch :disabled="viewDetail ? true : false">
 						</a-select>
 					</div>
 				</div>
@@ -59,7 +59,7 @@
               overflow: hidden;
             ">
 						<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">
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange" :disabled="viewDetail ? true : false">
 							<img style="
                   width: 100px;
                   height: 100px;
@@ -84,7 +84,7 @@
 
 					<div class="in">
 						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
-							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
+							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" :disabled="viewDetail ? true : false" />
 					</div>
 				</div>
 				<div class="name">
@@ -98,7 +98,7 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-							@change="classificationChange1" allowClear showSearch>
+							@change="classificationChange1" allowClear showSearch :disabled="viewDetail ? true : false">
 						</a-select>
 					</div>
 				</div>
@@ -114,7 +114,7 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
-							@change="classificationChange2" />
+							@change="classificationChange2" :disabled="viewDetail ? true : false" />
 					</div>
 				</div>
 				<div class="name name2">
@@ -122,7 +122,7 @@
 						<div class="inname" style="margin-top: 13px">项目说明</div>
 					</div>
 					<div class="in">
-						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" :disabled="viewDetail ? true : false"/>
 					</div>
 				</div>
 				<div class="name name2">
@@ -130,11 +130,11 @@
 						<div class="inname">同步学习记录</div>
 					</div>
 					<div class="in">
-						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
+						<a-radio @click="changeChecked" v-model:checked="checked" :disabled="viewDetail ? true : false"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
+                " >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
 					</div>
 				</div>
 				<div class="name">
@@ -148,7 +148,7 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
-							placeholder="集团级/组织级/现地级/部门级" />
+							placeholder="集团级/组织级/现地级/部门级" :disabled="viewDetail ? true : false" />
 					</div>
 				</div>
 				<div class="name">
@@ -162,7 +162,7 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
-							placeholder="集团级/组织级/现地级/部门级" />
+							placeholder="集团级/组织级/现地级/部门级" :disabled="viewDetail ? true : false" />
 					</div>
 				</div>
 				<div class="name">
@@ -171,7 +171,7 @@
 						<div class="inname">是否BOEU实施</div>
 					</div>
 					<div class="in">
-						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
+						<a-radio @click="changeChecked1" v-model:checked="checked1" :disabled="viewDetail ? true : false"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
@@ -207,7 +207,7 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
+							@change="classificationChange5" >
 						</a-select>
 						<a-select v-else :getPopupContainer="
 							(triggerNode) => {
@@ -260,6 +260,7 @@ export default {
 			classifySelect4: [],
 			rangevalue: [],
 			projectAscription: "",
+			viewDetail:routers.query.viewDetail?routers.query.viewDetail:null
 		});
 
 		if (routers.query.name == undefined) {

From 87db2fab4d3b24b141dcf8c253635f0b0d864358 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:09:30 +0800
Subject: [PATCH 52/90] =?UTF-8?q?feat:taskoage=E6=89=80=E6=9C=89=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=95=B4=E7=90=86=E6=88=90=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=9C=A8=E7=BA=BF=E6=8A=BD=E5=B1=89?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=E9=80=89=E9=A1=B9=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=BD=E5=B1=89=E6=8E=A5=E5=8F=A3=E8=BF=98?=
 =?UTF-8?q?=E6=B2=A1=E8=B0=83=E8=AF=95=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue      |   23 +-
 src/components/drawers/CreVote.vue        |    7 +-
 src/components/drawers/FaceManage.vue     |    6 +-
 src/components/drawers/TimeManage.vue     |    7 +-
 src/components/drawers/WorkManage.vue     |    5 +-
 src/views/learningpath/LevelAddDetail.vue | 1119 +++++++++++----------
 src/views/projectcenter/TaskPage.vue      |  543 ++++------
 7 files changed, 808 insertions(+), 902 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 34b6b274..6bdd58aa 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -59,10 +59,10 @@
           <div class="mntc_left">
             <div class="notice_icon"></div>
             <span style="color: rgba(0, 0, 0, 0.65); margin-right: 17px"
-              >已选择 <span style="color: #388be1">4</span> 项</span
+              >已选择 <span style="color: #388be1">{{RowsNum}}</span> 项</span
             >
             <span style="color: rgba(0, 0, 0, 0.65)"
-              >列表选项总计：<span>14</span> 条</span
+              >列表选项总计：<span>{{tableDataTotal}}</span> 条</span
             >
           </div>
           <div class="mntc_right">
@@ -169,7 +169,8 @@ export default {
       time: undefined,
       assessmentId:null,
       assessmentName:"",
-      tableData: [ ],
+      RowsNum: 0,
+      tableData: [],
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
@@ -183,7 +184,7 @@ export default {
     };
     const tableDataFunc = () => {
       const columns = [
-      {
+        {
           title: "课程编号",
           dataIndex: "num",
           key: "num",
@@ -230,10 +231,24 @@ export default {
       return columns;
     };
     const rowSelection = {
+      checkStrictly: false,
+      onSelectAll: (selected) => {
+        console.log(selected);
+        if (selected == true) {
+          state.RowsNum = state.tableDataTotal
+        } else {
+          state.RowsNum = 0
+        }
+      },
       onSelect: (selectedRows, selected, selectedRowKeys) => {
         console.log(
           "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
         console.log(selectedRows.assessmentId);
+        if (selected == true) {
+          state.RowsNum++
+        } else {
+          state.RowsNum--
+        }
         state.assessmentId = selectedRows.assessmentId;
         state.assessmentName = selectedRows.name;
       },
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 38298648..5209a904 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -239,9 +239,10 @@ export default {
       }
       // 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);
-
+      //     console.log('1111111111111111', state.questions);
+      //     console.log('2222222222222222', state.questions[i]);
+      //     console.log(' state.questions[i].inputV', state.questions[i].inputV,);
+      //     console.log('state.questions[i].options[k].opvalue',state.questions[i].options[k].opvalue)
       //   }
       // }
       let obj = {
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 68a3273d..028d1c6c 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -70,6 +70,10 @@
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
+          <div class="btn btn2">
+            <div class="img2"></div>
+            <div class="wz">导出作业</div>
+          </div>
         </div>
         <div class="line">
           <div class="inline">
@@ -362,7 +366,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-      //  getManageList();
+       getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index ef802882..8b8789ef 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -219,10 +219,6 @@ export default {
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
-
-    // watch(props.visible, ()=>{
-    //   getManageList()
-    // },{immediate:true});
     //获取任务管理列表
     const getManageList = () => {
       let obj = {
@@ -237,7 +233,6 @@ export default {
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log("csscas成功");
           state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
@@ -291,7 +286,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-      //  getManageList();
+        getManageList();
       }, 500);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 0962b1f4..bfb1bea4 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -65,6 +65,9 @@
           <div class="btn btn2" @click="showModal">
             <div class="wz">导出作业</div>
           </div>
+          <div class="btn btn2" @click="showModal">
+            <div class="wz">导入成绩</div>
+          </div>
         </div>
         <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
           <a-table
@@ -312,7 +315,7 @@ export default {
 
     onMounted(() => {
       setTimeout(() => {
-       // getManageList();
+       getManageList();
       }, 1000);
     });
     return {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index aea37d17..1621d781 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -212,495 +212,378 @@
             </div>
             <div class="text">在线</div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/mian.png" />
-            </div>
-            <div class="text">面授</div>
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/an.png" />
-            </div>
-            <div class="text">案例</div>
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddHomework">
-              <img src="../../assets/images/leveladd/zuo.png" />
-            </div>
-            <div class="text">作业</div>
-          </div>
-          <!-- 添加作业侧弹窗 -->
+          <!-- 添加在线侧弹窗 -->
           <div>
-            <add-homework
-              v-model:addhomeworkVisible="addhomeworkvisible"
-              :isLevel="true"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditWorkId="EditWorkId"
-              v-model:routerTaskId="routerTaskId"
-            />
+            <add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" v-model:edit="edit"
+              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+              v-model:EditOnlineId="EditOnlineId" />
           </div>
+          <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddTest">
-              <img src="../../assets/images/leveladd/kao.png" />
-            </div>
-            <div class="text">考试</div>
           </div>
-          <!-- 添加考试侧弹窗 -->
-          <div>
-            <add-test
-              v-model:addtestVisible="addtestvisible"
-              :isLevel="true"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditTestId="EditTestId"
-              v-model:routerTaskId="routerTaskId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddLive">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zhi.png" />
-            </div>
-            <div class="text">直播</div>
-          </div>
-          <div>
-            <add-live
-              v-model:addliveVisible="addlivevisible"
-              :isLevel="true"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:edit="edit"
-              v-model:EditLiveId="EditLiveId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddRef">
-            <div class="img">
-              <img src="../../assets/images/leveladd/wai.png" />
-            </div>
-            <div class="text">外链</div>
-          </div>
-          <div>
-            <add-ref
-              v-model:addrefVisible="addrefvisible"
-              :isLevel="true"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:edit="edit"
-              v-model:EditRefId="EditRefId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddDiscuss">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tao.png" />
-            </div>
-            <div class="text">讨论</div>
-          </div>
-          <div>
-            <add-discuss
-              v-model:adddiscussVisible="adddiscussvisible"
-              @changeData="updateTableData"
-              :isLevel="true"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:EditDiscussId="EditDiscussId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddActive">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/huo.png" />
-            </div>
-            <div class="text">活动</div>
-          </div>
-          <div>
-            <add-active
-              v-model:addactiveVisible="addactivevisible"
-              :isLevel="true"
-              v-model:edit="edit"
-              v-model:isactive="isactive"
-              @changeData="updateTableData"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:EditActiveId="EditActiveId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddEval">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/ce.png" />
-            </div>
-            <div class="text">测评</div>
-            <!-- 添加测评侧弹窗 -->
-            <div>
-              <add-eval
-                v-model:addevalVisible="addevalvisible"
-                :isLevel="true"
-                @changeData="updateTableData"
-                v-model:isactive="isactive"
-                v-model:edit="edit"
-                v-model:routerId="routerId"
-                v-model:EditEvalId="EditEvalId"
-                v-model:routerTaskId="routerTaskId"
-              />
-            </div>
-            <!-- 添加测评侧弹窗 -->
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddInvist">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/diao.png" />
-            </div>
-            <div class="text">评估</div>
-            <!-- 添加评估侧弹窗 -->
-            <div>
-              <add-invist
-                v-model:addinvistVisible="addinvistvisible"
-                :isLevel="true"
-                @changeData="updateTableData"
-                v-model:isactive="isactive"
-                v-model:edit="edit"
-                v-model:routerId="routerId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:EditInvistId="EditInvistId"
-                v-model:routerTaskId="routerTaskId"
-              />
-            </div>
-            <!-- 添加评估侧弹窗 -->
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddVote">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tou.png" />
-            </div>
-            <div class="text">投票</div>
-            <!-- 添加投票侧弹窗 -->
-            <div>
-              <add-vote
-                v-model:addvoteVisible="addvotevisible"
-                :isLevel="true"
-                @changeData="updateTableData"
-                v-model:isactive="isactive"
-                v-model:edit="edit"
-                v-model:routerId="routerId"
-                v-model:chooseStageId="chooseStageId"
-                v-model:EditVoteId="EditVoteId"
-                v-model:routerTaskId="routerTaskId"
-              />
-            </div>
-            <!-- 添加投票侧弹窗 -->
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddVote">
-          <div class="itcon">
-            <div class="img">
-              <img
-                src="../../assets/images/leveladd/xiang.png"
-                @click="showDrawer"
-              />
-            </div>
-            <div class="text">项目</div>
-          </div>
-        </div>
-      </div>
-      <div class="boom">
-        <div class="boomcen">
-          <div class="title">
-            <div class="tit_left">
-              <span>任务列表</span>
-            </div>
-            <div class="tit_right">
-              <div class="btn btn1" @click="moveTask">
-                <div class="btnText">移动到任务阶段</div>
+          <div class="item">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/mian.png" />
               </div>
-              <div class="btn btn2">
-                <div class="imgIcon"></div>
-                <div class="btnText" @click="showDeleteALLModal">批量删除</div>
+              <div class="text">面授</div>
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/an.png" />
               </div>
+              <div class="text">案例</div>
+            </div>
+            <!-- 添加案例侧弹窗 -->
+            <div>
+              <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
+                v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+                v-model:EditCaseId="EditCaseId" />
+            </div>
+            <!-- 添加案例侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddHomework">
+                <img src="../../assets/images/leveladd/zuo.png" />
+              </div>
+              <div class="text">作业</div>
+            </div>
+            <!-- 添加作业侧弹窗 -->
+            <div>
+              <add-homework v-model:addhomeworkVisible="addhomeworkvisible" :isLevel="true" @changeData="updateTableData"
+                v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
+                v-model:EditWorkId="EditWorkId" v-model:routerTaskId="routerTaskId" />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddTest">
+                <img src="../../assets/images/leveladd/kao.png" />
+              </div>
+              <div class="text">考试</div>
+            </div>
+            <!-- 添加考试侧弹窗 -->
+            <div>
+              <add-test v-model:addtestVisible="addtestvisible" :isLevel="true" @changeData="updateTableData"
+                v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
+                v-model:EditTestId="EditTestId" v-model:routerTaskId="routerTaskId" />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddLive">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zhi.png" />
+              </div>
+              <div class="text">直播</div>
+            </div>
+            <div>
+              <add-live v-model:addliveVisible="addlivevisible" :isLevel="true" @changeData="updateTableData"
+                v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddRef">
+              <div class="img">
+                <img src="../../assets/images/leveladd/wai.png" />
+              </div>
+              <div class="text">外链</div>
+            </div>
+            <div>
+              <add-ref v-model:addrefVisible="addrefvisible" :isLevel="true" @changeData="updateTableData"
+                v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddDiscuss">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tao.png" />
+              </div>
+              <div class="text">讨论</div>
+            </div>
+            <div>
+              <add-discuss v-model:adddiscussVisible="adddiscussvisible" @changeData="updateTableData" :isLevel="true"
+                v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId" v-model:EditDiscussId="EditDiscussId" />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddActive">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/huo.png" />
+              </div>
+              <div class="text">活动</div>
+            </div>
+            <div>
+              <add-active v-model:addactiveVisible="addactivevisible" :isLevel="true" v-model:edit="edit"
+                v-model:isactive="isactive" @changeData="updateTableData" v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:EditActiveId="EditActiveId" />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddEval">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/ce.png" />
+              </div>
+              <div class="text">测评</div>
+              <!-- 添加测评侧弹窗 -->
+              <div>
+                <add-eval v-model:addevalVisible="addevalvisible" :isLevel="true" @changeData="updateTableData"
+                  v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:EditEvalId="EditEvalId"
+                  v-model:routerTaskId="routerTaskId" />
+              </div>
+              <!-- 添加测评侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddInvist">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/diao.png" />
+              </div>
+              <div class="text">评估</div>
+              <!-- 添加评估侧弹窗 -->
+              <div>
+                <add-invist v-model:addinvistVisible="addinvistvisible" :isLevel="true" @changeData="updateTableData"
+                  v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId" v-model:EditInvistId="EditInvistId" v-model:routerTaskId="routerTaskId" />
+              </div>
+              <!-- 添加评估侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddVote">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tou.png" />
+              </div>
+              <div class="text">投票</div>
+              <!-- 添加投票侧弹窗 -->
+              <div>
+                <add-vote v-model:addvoteVisible="addvotevisible" :isLevel="true" @changeData="updateTableData"
+                  v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId" v-model:EditVoteId="EditVoteId" v-model:routerTaskId="routerTaskId" />
+              </div>
+              <!-- 添加投票侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddProj">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/xiang.png" @click="leaveProjDrawer" />
+              </div>
+              <div class="text">项目</div>
             </div>
           </div>
-          <div class="tableBox">
-            <div
-              style="
-                height: 50px;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                background-color: #eff4fc;
-                font-size: 14px;
-                font-weight: 400;
-                color: #999ba3;
-                line-height: 36px;
-                border-bottom: 1px solid #f2f6fc;
-              "
-            >
-              <div
-                style="
-                  width: 87px;
-                  text-align: center;
+          </div>
+          <div class="boom">
+            <div class="boomcen">
+              <div class="title">
+                <div class="tit_left">
+                  <span>任务列表</span>
+                </div>
+                <div class="tit_right">
+                  <div class="btn btn1" @click="moveTask">
+                    <div class="btnText">移动到任务阶段</div>
+                  </div>
+                  <div class="btn btn2">
+                    <div class="imgIcon"></div>
+                    <div class="btnText" @click="showDeleteALLModal">批量删除</div>
+                  </div>
+                </div>
+              </div>
+              <div class="tableBox">
+                <div style="
+                  height: 50px;
                   display: flex;
-                  margin-left: 46px;
-                "
-              >
-                <img
-                  style="
-                    width: 16px;
-                    height: 16px;
-                    cursor: pointer;
-                    margin-top: 12px;
-                  "
-                  :src="
-                    selectAll === 0
-                      ? require('../../assets/images/notSelect.png')
-                      : selectAll === 1
-                      ? require('../../assets/images/selectAll.png')
-                      : require('../../assets/images/select.png')
-                  "
-                  @click="selectRowAll"
-                />
-                <!-- <a-checkbox
-                    v-model:checked="selectAll"
-                    @change="selectRowAll"
-                  >
-                  </a-checkbox> -->
-                <div style="margin-top: 2px; margin-left: 8px">类型</div>
-              </div>
-              <div style="width: 120px; text-align: center">任务名称</div>
-              <div style="width: 120px; text-align: center">必修/选修</div>
-              <div style="width: 87px; text-align: center">时长</div>
-              <div style="width: 120px; text-align: center; margin-right: 20px">
-                操作
-              </div>
-            </div>
-            <draggable
-              v-model="tableData"
-              chosenClass="chosen"
-              ghostClass="ghost"
-              forceFallback="true"
-              group="task"
-              animation="500"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <template #item="{ element }">
-                <div
-                  style="
-                    height: 50px;
+                  justify-content: space-between;
+                  align-items: center;
+                  background-color: #eff4fc;
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #999ba3;
+                  line-height: 36px;
+                  border-bottom: 1px solid #f2f6fc;
+                ">
+                  <div style="
+                    width: 87px;
+                    text-align: center;
                     display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    border-bottom: 1px solid #f2f6fc;
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #4f5156;
-                    line-height: 36px;
-                  "
-                  class="tableRow"
-                >
-                  <div
-                    style="
-                      width: 87px;
-                      text-align: center;
-                      margin-left: 46px;
-                      position: relative;
-                    "
-                  >
-                    <div class="racona">
-                      <div
-                        class="img"
-                        style="
-                          cursor: pointer;
-                          margin-top: 2px;
-                          margin-right: 9px;
-                          position: absolute;
-                          left: -25px;
-                        "
-                      ></div>
-                      <a-checkbox
-                        :id="element.id"
-                        v-model:checked="element.checked"
-                        @change="changeRow"
-                      >
-                      </a-checkbox>
-                      <div style="margin-top: 2px; margin-left: 8px">
-                        {{ element.lei }}
-                      </div>
-                    </div>
+                    margin-left: 46px;
+                  ">
+                    <img style="
+                      width: 16px;
+                      height: 16px;
+                      cursor: pointer;
+                      margin-top: 12px;
+                    " :src="
+                      selectAll === 0
+                        ? require('../../assets/images/notSelect.png')
+                        : selectAll === 1
+                        ? require('../../assets/images/selectAll.png')
+                        : require('../../assets/images/select.png')
+                    " @click="selectRowAll" />
+                    <!-- <a-checkbox
+                      v-model:checked="selectAll"
+                      @change="selectRowAll"
+                    >
+                    </a-checkbox> -->
+                    <div style="margin-top: 2px; margin-left: 8px">类型</div>
                   </div>
-                  <div style="width: 120px; text-align: center">
-                    {{ element.creater }}
+                  <div style="width: 120px; text-align: center">任务名称</div>
+                  <div style="width: 120px; text-align: center">必修/选修</div>
+                  <div style="width: 87px; text-align: center">时长</div>
+                  <div style="width: 120px; text-align: center; margin-right: 20px">
+                    操作
                   </div>
-                  <div style="width: 120px; text-align: center">
-                    <div class="opat">
-                      <div class="opacationt clearfix">
-                        <a-switch
-                          style="margin-left: -50px; margin-top: 3px"
-                          v-model:checked="element.checked1"
-                          size="small"
-                          active-color="red"
-                          @click="changeCourseType(element)"
-                        />
-                        <div class="showt clearfix">
-                          <div
-                            class="bi"
-                            :style="{
-                              'z-index': element.checked1 ? 999 : 998,
-                            }"
-                          >
-                            必修
+                </div>
+                <draggable v-model="tableData" chosenClass="chosen" ghostClass="ghost" forceFallback="true" group="task"
+                  animation="500" @start="onStart" @end="onEnd">
+                  <template #item="{ element }">
+                    <div style="
+                      height: 50px;
+                      display: flex;
+                      justify-content: space-between;
+                      align-items: center;
+                      border-bottom: 1px solid #f2f6fc;
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4f5156;
+                      line-height: 36px;
+                    " class="tableRow">
+                      <div style="
+                        width: 87px;
+                        text-align: center;
+                        margin-left: 46px;
+                        position: relative;
+                      ">
+                        <div class="racona">
+                          <div class="img" style="
+                            cursor: pointer;
+                            margin-top: 2px;
+                            margin-right: 9px;
+                            position: absolute;
+                            left: -25px;
+                          "></div>
+                          <a-checkbox :id="element.id" v-model:checked="element.checked" @change="changeRow">
+                          </a-checkbox>
+                          <div style="margin-top: 2px; margin-left: 8px">
+                            {{ element.lei }}
+                          </div>
+                        </div>
+                      </div>
+                      <div style="width: 120px; text-align: center">
+                        {{ element.creater }}
+                      </div>
+                      <div style="width: 120px; text-align: center">
+                        <div class="opat">
+                          <div class="opacationt clearfix">
+                            <a-switch style="margin-left: -50px; margin-top: 3px" v-model:checked="element.checked1" size="small"
+                              active-color="red" @click="changeCourseType(element)" />
+                            <div class="showt clearfix">
+                              <div class="bi" :style="{
+                                'z-index': element.checked1 ? 999 : 998,
+                              }">
+                                必修
+                              </div>
+                              <div class="xuan">选修</div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div style="width: 87px; text-align: center">
+                        {{ element.cretime }}分钟
+                      </div>
+                      <div style="width: 120px; text-align: center; margin-right: 20px">
+                        <div class="opa">
+                          <div class="opacation">
+                            <span style="
+                              color: #4ea6ff;
+                              margin-right: 25px;
+                              cursor: pointer;
+                            " @click="
+                              decideType(
+                                element.lei,
+                                element.courseId,
+                                element.id
+                              )
+                            ">
+                              编辑
+                            </span>
+                            <span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.id)">
+                              删除
+                            </span>
                           </div>
-                          <div class="xuan">选修</div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <div style="width: 87px; text-align: center">
-                    {{ element.cretime }}分钟
-                  </div>
-                  <div
-                    style="width: 120px; text-align: center; margin-right: 20px"
-                  >
-                    <div class="opa">
-                      <div class="opacation">
-                        <span
-                          style="
-                            color: #4ea6ff;
-                            margin-right: 25px;
-                            cursor: pointer;
-                          "
-                          @click="
-                            decideType(
-                              element.lei,
-                              element.courseId,
-                              element.id
-                            )
-                          "
-                        >
-                          编辑
-                        </span>
-                        <span
-                          style="color: #4ea6ff; cursor: pointer"
-                          @click="showDeleteModal(element.id)"
-                        >
-                          删除
-                        </span>
-                      </div>
+                  </template>
+                </draggable>
+              </div>
+              <!-- 无数据样式 -->
+              <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
+                <div class="notablebox">
+                  <div class="boxbody">
+                    <div class="boximg"></div>
+                    <div class="boxtitle">
+                      <span style="color: #ffb64e; font-size: 20px">无任务</span>
+                    </div>
+                    <div class="boxtitle2">
+                      <span style="color: #878b92">请点击上方，创建任务</span>
                     </div>
                   </div>
-                </div>
-              </template>
-            </draggable>
-          </div>
-          <!-- 无数据样式 -->
-          <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
-            <div class="notablebox">
-              <div class="boxbody">
-                <div class="boximg"></div>
-                <div class="boxtitle">
-                  <span style="color: #ffb64e; font-size: 20px">无任务</span>
-                </div>
-                <div class="boxtitle2">
-                  <span style="color: #878b92">请点击上方，创建任务</span>
+                  <div class="smallleft"></div>
+                  <div class="smallright"></div>
                 </div>
               </div>
-              <div class="smallleft"></div>
-              <div class="smallright"></div>
+              <!-- 无数据样式 -->
             </div>
           </div>
-          <!-- 无数据样式 -->
-        </div>
-      </div>
-      <div class="footbtn">
-        <div class="btnbox">
-          <div class="btn btn2">
-            <div class="btnText">暂存</div>
-          </div>
-          <div class="btn btn2">
-            <div class="btnText">确定</div>
-          </div>
-          <div class="btn btn1" @click="gqxy_hShow">
-            <div class="btnText">下一步</div>
-          </div>
-        </div>
-      </div>
-      <div class="draw" style="position: relative">
-        <a-drawer
-          v-model:visible="visible"
-          class="drawerStyle ProjectDrawer"
-          title="关联项目"
-          placement="right"
-          width="80%"
-          @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 class="footbtn">
+            <div class="btnbox">
+              <div class="btn btn2">
+                <div class="btnText">暂存</div>
+              </div>
+              <div class="btn btn2">
+                <div class="btnText">确定</div>
+              </div>
+              <div class="btn btn1" @click="gqxy_hShow">
+                <div class="btnText">下一步</div>
+              </div>
             </div>
-            <div class="drawerbox">
-              <a-table
-                :columns="drawertableColumns()"
-                :data-source="drawertableData"
-                :loading="tableDataTotal === -1 ? true : false"
-                :scroll="{ x: 700 }"
-                @expand="expandTable"
-                :pagination="false"
-              >
-              </a-table>
-            </div>
-            <div class="btnn">
-              <button @click="showDrawer" class="btn1">取消</button>
-              <button @click="showDrawer" class="btn2">确定</button>
+          </div>
+          <div class="draw" style="position: relative">
+            <a-drawer v-model:visible="addprojvisible" :isLevel="isLevel" class="drawerStyle ProjectDrawer" title="关联项目"
+              placement="right" width="80%" @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="leaveProjDrawer" />
+                </div>
+                <div class="drawerbox">
+                  <a-table :columns="drawertableColumns()" :data-source="drawertableData"
+                    :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)" :row-selection="rowSelection"
+                    :loading="tableDataTotal === -1 ? true : false" :scroll="{ x: 700 }" @expand="expandTable"
+                    :pagination="false">
+                  </a-table>
+                </div>
+                <div class="btnn">
+                  <button @click="leaveProjDrawer" class="btn1">取消</button>
+                  <button @click="updateTask" class="btn2">确定</button>
             </div>
           </div>
         </a-drawer>
@@ -918,6 +801,10 @@ import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
+import * as apiProj from "../../api/indexInvist.js";
+import * as apiTask from "../../api/indexTaskadd";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -1035,104 +922,108 @@ export default {
           time: "2022-07-15 14:00",
         },
       ],
-      drawertableData: [
-        {
-          key: 1,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-          children: [
-            {
-              key: "1-1",
-              projectName: "管理者进阶-腾飞班",
-              manager: "黄华  刘俊",
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-              children: [
-                {
-                  key: "1-1-1",
-                  projectName: "管理者进阶-腾飞班K1",
-                  manager: "黄华  刘俊",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          key: 2,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-          children: [
-            {
-              key: "2-1",
-              projectName: "管理者进阶-腾飞班",
-              manager: "黄华  刘俊",
+      drawertableData: [],
+      // drawertableData: [
+      //   {
+      //     key: 1,
+      //     projectName: "管理者进阶",
+      //     manager: "黄华  刘俊",
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //     children: [
+      //       {
+      //         key: "1-1",
+      //         projectName: "管理者进阶-腾飞班",
+      //         manager: "黄华  刘俊",
+      //         creater: "毛继禹",
+      //         time: "2022-07-20 14:00:03",
+      //         children: [
+      //           {
+      //             key: "1-1-1",
+      //             projectName: "管理者进阶-腾飞班K1",
+      //             manager: "黄华  刘俊",
+      //             creater: "毛继禹",
+      //             time: "2022-07-20 14:00:03",
+      //           },
+      //         ],
+      //       },
+      //     ],
+      //   },
+      //   {
+      //     key: 2,
+      //     projectName: "管理者进阶",
+      //     manager: "黄华  刘俊",
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //     children: [
+      //       {
+      //         key: "2-1",
+      //         projectName: "管理者进阶-腾飞班",
+      //         manager: "黄华  刘俊",
 
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-              children: [
-                {
-                  key: "2-1-1",
-                  projectName: "管理者进阶-腾飞班K1",
-                  manager: "黄华  刘俊",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
-                },
-              ],
-            },
-          ],
-        },
+      //         creater: "毛继禹",
+      //         time: "2022-07-20 14:00:03",
+      //         children: [
+      //           {
+      //             key: "2-1-1",
+      //             projectName: "管理者进阶-腾飞班K1",
+      //             manager: "黄华  刘俊",
+      //             creater: "毛继禹",
+      //             time: "2022-07-20 14:00:03",
+      //           },
+      //         ],
+      //       },
+      //     ],
+      //   },
 
-        {
-          key: 3,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //   {
+      //     key: 3,
+      //     projectName: "管理者进阶-腾飞班K1",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //   },
+      //   {
+      //     key: 4,
+      //     projectName: "管理者进阶-腾飞班K1",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 5,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //   },
+      //   {
+      //     key: 5,
+      //     projectName: "管理者进阶-腾飞班K1",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 6,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //   },
+      //   {
+      //     key: 6,
+      //     projectName: "管理者进阶-腾飞班K1",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 7,
-          projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //   },
+      //   {
+      //     key: 7,
+      //     projectName: "管理者进阶-腾飞班K1",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-      ],
+      //     creater: "毛继禹",
+      //     time: "2022-07-20 14:00:03",
+      //   },
+      // ],
       currentPage: 1,
       tableDataTotal: 100,
       pageSize: 10,
       visible: false,
+      //项目
+      editproj: false,
+      addprojvisible: false,
       AddSvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
       addlivevisible: false, //添加直播抽屉
@@ -1154,6 +1045,8 @@ export default {
       EditEvalId: "",
       EditInvistId: "",
       EditVoteId: "",
+      //项目
+      EditProjId: "",
       routerTaskId: "",
       chapterId: "",
       stageId: "",
@@ -1177,6 +1070,14 @@ export default {
       ListChoosedId: 0,
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
+      //项目抽屉参数
+      time: undefined,
+      assessmentId: null,
+      assessmentName: "",
+      isLevel: false,
+      projectId: null,
+      projectTaskId: null,
+      chooseStageId: null,
     });
 
     //新建关卡
@@ -1227,6 +1128,11 @@ export default {
     const showDrawer = () => {
       state.visible = true;
     };
+    //关闭项目抽屉
+    const leaveProjDrawer = () => {
+      state.addprojvisible = false;
+      state.isLevel = false;
+    };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
       console.log("homework==============", id, state.isactive);
@@ -1279,6 +1185,13 @@ export default {
       state.EditActiveId = id;
       state.routerTaskId = eleId;
     };
+    //打开项目抽屉
+    const showDrawerAddProj = (id, eleId) => {
+      state.addprojvisible = true;
+      state.isLevel = true;
+      state.EditActiveId = id;
+      state.routerTaskId = eleId;
+    };
 
     // tableData数据赋值方法
     const dataAssignment = (id) => {
@@ -1713,6 +1626,8 @@ export default {
         showDrawerAddEval(id, eleId);
       } else if (type == "投票") {
         showDrawerAddVote(id, eleId);
+      } else if (type == "项目") {
+        showDrawerAddVote(id, eleId);
       }
     };
     //删除关卡
@@ -1756,6 +1671,98 @@ export default {
           message.warning("修改失败");
         });
     };
+
+    //项目抽屉用的
+    const rowSelection = {
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+        console.log(selectedRows.assessmentId);
+        state.assessmentId = selectedRows.assessmentId;
+        state.assessmentName = selectedRows.name;
+      },
+    };
+    const getTableDate = (drawertableData) => {
+      let data = drawertableData;
+      let array = [];
+      data.map((value, index) => {
+        let obj = {
+          key: index,
+          assessmentId: value.assessmentId,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+    };
+    //获取全部项目信息接口
+    const getAllProjText = () => {
+      apiProj
+        .queryAssessmentDetailList({
+          assessmentName: "",
+          // pageNo: state.currentPage,
+          // pageSize: state.pageSize,
+        })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            getTableDate(arr);
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部在线信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
+    const updateTask = () => {
+      console.log("jinlaile=================", state.assessmentName)
+      if (state.isLevel) {
+        RouterEditTask({
+          chapterId: state.isactive,
+          courseId: state.assessmentId,
+          name: state.assessmentName,
+          routerId: state.routerId,
+          routerTaskId: state.routerTaskId || 0,
+          type: 13,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`)
+            // ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } else {
+        console.log("=========projectTaskId", state.projectTaskId);
+        apiTask
+          .addTask({
+            courseId: state.assessmentId,
+            name: state.assessmentName,
+            projectId: state.projectId,
+            projectTaskId: state.projectTaskId || 0,
+            stageId: state.chooseStageId,
+            type: 13,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            // ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      }
+    }
+    onMounted(() => {
+      // createCase();
+      getAllProjText();
+    });
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1785,6 +1792,8 @@ export default {
       deleteLevelTask,
       showDrawerAddLive,
       showDrawerAddRef,
+      showDrawerAddProj,
+      leaveProjDrawer,
       closeDeleteModel,
       clearEditData,
       showDrawerAddDiscuss,
@@ -1798,6 +1807,10 @@ export default {
       updateTableData,
       deleteChapter,
       changeCourseType,
+      rowSelection,
+      getTableDate,
+      getAllProjText,
+      updateTask,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 6a7c4608..4da39841 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -419,23 +419,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        :style="{
-                          display:
-                            item.type == '6' ||
-                            item.type == '9' ||
-                            item.type == '2'
-                              ? 'flex'
-                              : 'none',
-                        }"
-                        @click="
-                          item.type == '2'
-                            ? showCopyModal(item.type)
-                            : item.type == '6'
-                            ? showzhibModal(item.type)
-                            : item.type == '9'
-                            ? showhuodModal(item.type)
-                            : null
-                        "
+                        @click=" showCopyModal(item.type)"
                       >
                         二维码
                       </div>
@@ -1082,60 +1066,33 @@
       :projectTaskId="projectTaskId"
     />
     <!-- 考试管理抽屉 -->
-    <test-manage
-      v-model:TMvisible.sync="TMvisible"
-      v-if="Wvisible"
-      :title="showTestText"
-      :projectTaskId="projectTaskId"
-    />
+    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
-
+    
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
-      <a-modal
-        v-model:visible="pubproject"
-        :title="null"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        :centered="true"
-        wrapClassName="pubproject"
-        width="679px"
-        height="437px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+      <a-modal v-model:visible="pubproject" :title="null" @ok="closeModal" :footer="null" :closable="false" :centered="true"
+        wrapClassName="pubproject" width="679px" height="437px">
+        <div class="modalHeader" style="
+                            width: 100%;
+                            height: 68px;
+                            display: flex;
+                            align-items: center;
+                            justify-content: space-between;
+                          ">
           <div class="headerLeft" style="margin-left: 32px">
-            <span style="width: 15px; height: 15px"
-              ><img src="../../assets/images/taskpage/pub.png"
-            /></span>
-            <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-              >项目发布</span
-            >
+            <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
+            <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">项目发布</span>
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
+            <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
           </div>
         </div>
         <div class="modalMain">
           <div class="projectname">管理者进阶-腾飞班1</div>
           <div class="projecttime">
-            <span class="timeti">项目时间：</span
-            ><span class="timeme">2022/08/01-2022/08/30</span>
+            <span class="timeti">项目时间：</span><span class="timeme">2022/08/01-2022/08/30</span>
           </div>
           <div class="projectbox">
             <div class="promessage">
@@ -1152,12 +1109,8 @@
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
-            <a-checkbox v-model:checked="checked1"
-              ><span class="sendpeo">发给老师</span></a-checkbox
-            >
-            <a-checkbox v-model:checked="checked2"
-              ><span class="sendpeo">发给学员</span></a-checkbox
-            >
+            <a-checkbox v-model:checked="checked1"><span class="sendpeo">发给老师</span></a-checkbox>
+            <a-checkbox v-model:checked="checked2"><span class="sendpeo">发给学员</span></a-checkbox>
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal">取消</a-button>
@@ -1165,228 +1118,181 @@
           </div>
         </div>
       </a-modal>
-    </div>
-    <!-- 概览（无数据）-项目发布弹窗 -->
-    <!-- 学员-创建小组弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="stugroup"
-        :title="null"
-        @ok="closeModal2"
-        :footer="null"
-        :closable="false"
-        :centered="true"
-        wrapClassName="doublepro"
-        width="624px"
-        height="332px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px">创建小组</span>
-          </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
+      </div>
+      <!-- 概览（无数据）-项目发布弹窗 -->
+      <!-- 学员-创建小组弹窗 -->
+      <div>
+        <a-modal v-model:visible="stugroup" :title="null" @ok="closeModal2" :footer="null" :closable="false" :centered="true"
+          wrapClassName="doublepro" width="624px" height="332px">
+          <div class="modalHeader" style="
+                            width: 100%;
+                            height: 68px;
+                            display: flex;
+                            align-items: center;
+                            justify-content: space-between;
+                          ">
+            <div class="headerLeft" style="margin-left: 32px">
+              <span class="headerLeftText" style="font-size: 16px">创建小组</span>
             </div>
-            <div class="inname">小组名称:</div>
-            <div class="in">
-              <a-input
-                v-model:value="valueaddg"
-                placeholder="请输入小组名称"
-                style="border-radius: 8px; height: 40px"
-              />
+            <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
+              <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
             </div>
           </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px; margin-left: 15px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
+          <div class="modalMain">
+            <div class="name">
+              <div class="star" style="margin-top: -4px">
+                <img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
+              </div>
+              <div class="inname">小组名称:</div>
+              <div class="in">
+                <a-input v-model:value="valueaddg" placeholder="请输入小组名称" style="border-radius: 8px; height: 40px" />
+              </div>
             </div>
-            <div class="inname">小组长:</div>
-            <div class="in">
-              <a-input
-                v-model:value="valueaddm"
-                placeholder="请输入小组长"
-                style="border-radius: 8px; height: 40px"
-              />
+            <div class="name">
+              <div class="star" style="margin-top: -4px">
+                <img style="width: 10px; height: 10px; margin-left: 15px" src="../../assets/images/basicinfo/asterisk.png" />
+              </div>
+              <div class="inname">小组长:</div>
+              <div class="in">
+                <a-input v-model:value="valueaddm" placeholder="请输入小组长" style="border-radius: 8px; height: 40px" />
+              </div>
+            </div>
+            <div class="pubtn">
+              <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+              <a-button class="pubtn2" @click="createG">确定</a-button>
             </div>
           </div>
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="createG">确定</a-button>
+        </a-modal>
+      </div>
+      <!-- 学员-创建小组弹窗 -->
+      <!-- 取消学员弹窗 -->
+      <div>
+        <a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
+          @cancel="closeModal1">
+          <div class="delete">
+            <div class="del_header"></div>
+            <div class="del_main">
+              <div class="header">
+                <div class="icon1"></div>
+                <span>提示</span>
+              </div>
+              <div class="body">
+                <span>您是否授予此学员优秀学员称号？</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="cancelyou">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="closeModal1">确定</div>
+                </div>
+              </div>
+            </div>
           </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 学员-创建小组弹窗 -->
-    <!-- 取消学员弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="canclestu"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu"
-        centered="true"
-        @cancel="closeModal1"
-      >
+        </a-modal>
+      </div>
+      <!-- 取消学员弹窗 -->
+      <!-- 优秀学员弹窗 -->
+      <div>
+        <a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
+          <div class="delete">
+            <div class="del_header"></div>
+            <div class="del_main">
+              <div class="header">
+                <div class="icon1"></div>
+                <span>提示</span>
+              </div>
+              <div class="body">
+                <span>您是否取消此学员优学员称号？</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="cancelcanyou">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="closeModal3">确定</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-modal>
+      </div>
+      <!-- 取消学员弹窗 -->
+      <!-- 删除学员弹窗 -->
+      <div>
+        <a-modal v-model:visible="deleteOneStu" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
+          <div class="delete">
+            <div class="del_header"></div>
+            <div class="del_main">
+              <div class="header">
+                <div class="icon1"></div>
+                <span>提示</span>
+              </div>
+              <div class="body">
+                <span>您确定要删除此学员吗</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="closeDeleteOne">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-modal>
+      </div>
+      <!-- 删除学员弹窗 -->
+      
+      <!-- 删除弹窗 -->
+      <div>
+        <a-modal v-model:visible="delete_hs" :footer="null" :closable="closableQR" wrapClassName="DelModal"
+          style="margin-top: 400px" @cancel="delete_exit">
+          <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
+            <div class="del_header"></div>
+            <div class="del_main">
+              <div class="header">
+                <div class="del-icon"></div>
+                <span>提示</span>
+                <div class="close_exit" @click="delete_exit"></div>
+              </div>
+              <div class="body">
+                <span>您确定要删除此课程吗</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="delete_exit">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="delete_exit">确定</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-modal>
+      </div>
+      <!-- 删除弹窗 -->
+      <!-- 管理二维码 -->
+      <a-modal v-model:visible="copyModal" :footer="null" :closable="closeCopy" wrapClassName="facemanageModal"
+        centered="true">
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
             <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您是否授予此学员优秀学员称号？</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="cancelyou">取消</div>
-              </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeModal1">确定</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 取消学员弹窗 -->
-    <!-- 优秀学员弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="canclestu1"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu1"
-        centered="true"
-      >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您是否取消此学员优学员称号？</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="cancelcanyou">取消</div>
-              </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeModal3">确定</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 取消学员弹窗 -->
-    <!-- 删除学员弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="deleteOneStu"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu1"
-        centered="true"
-      >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您确定要删除此学员吗</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="closeDeleteOne">取消</div>
-              </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 删除学员弹窗 -->
-
-    <!-- 删除弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="delete_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="DelModal"
-        style="margin-top: 400px"
-        @cancel="delete_exit"
-      >
-        <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="del-icon"></div>
-              <span>提示</span>
-              <div class="close_exit" @click="delete_exit"></div>
-            </div>
-            <div class="body">
-              <span>您确定要删除此课程吗</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="delete_exit">取消</div>
-              </div>
-              <div class="del_btn btn2">
-                <div class="btnText" @click="delete_exit">确定</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 删除弹窗 -->
-    <!-- 面授管理二维码 -->
-    <a-modal
-      v-model:visible="copyModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="facemanageModal"
-      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="icon"></div>
+              <span v-if="QRtype == '1'">在线管理</span>
+              <span v-if="QRtype == '2'">面授管理</span>
+              <span v-if="QRtype == '3'">案例管理</span>
+              <span v-if="QRtype == '4'">作业管理</span>
+              <span v-if="QRtype == '5'">考试管理</span>
+              <span v-if="QRtype == '6'">直播管理</span>
+              <span v-if="QRtype == '7'">外链管理</span>
+              <span v-if="QRtype == '8'">讨论管理</span>
+              <span v-if="QRtype == '9'">活动管理</span>
+              <span v-if="QRtype == '10'">测评管理</span>
+              <span v-if="QRtype == '11'">评估管理</span>
+              <span v-if="QRtype == '12'">投票管理</span>
             <div class="close_exit" @click="closeCopyModal"></div>
           </div>
           <div class="body">
@@ -1401,62 +1307,6 @@
         </div>
       </div>
     </a-modal>
-    <!-- 直播管理二维码 -->
-    <a-modal
-      v-model:visible="zhibModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="facemanageModal"
-      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="closezhibModal"></div>
-          </div>
-          <div class="body">
-            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
-          </div>
-          <div class="footerr">
-            <div class="onload">下载二维码</div>
-            <div class="onloadpx">200*200</div>
-            <div class="onloadpx">400*400</div>
-            <div class="onloadpx">800*800</div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!-- 活动管理二维码 -->
-    <a-modal
-      v-model:visible="huodModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="facemanageModal"
-      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="closehuodModal"></div>
-          </div>
-          <div class="body">
-            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
-          </div>
-          <div class="footerr">
-            <div class="onload">下载二维码</div>
-            <div class="onloadpx">200*200</div>
-            <div class="onloadpx">400*400</div>
-            <div class="onloadpx">800*800</div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
     <!-- 批量删除弹窗 -->
     <div>
       <a-modal
@@ -1661,7 +1511,7 @@ export default {
       copyModal: false, //面授二维码弹窗
       closeCopy: false, //面授二维码关闭图标
       zhibModal: false, //直播二维码弹窗
-
+      QRtype: "", //二维码标题
       huodModal: false, //活动二维码弹窗
       allDelete: false, //批量删除弹窗
       pubproject: false,
@@ -2406,8 +2256,33 @@ export default {
         state.stugroup = false;
       }
     };
-    const showCopyModal = () => {
+    const showCopyModal = (itemtype) => {
       state.copyModal = true;
+      if (itemtype == "1") {
+        state.QRtype = "1"
+      } else if (itemtype == "2") {
+        state.QRtype = "2"
+      } else if (itemtype == "3") {
+        state.QRtype = "3"
+      } else if (itemtype == "4") {
+        state.QRtype = "4"
+      } else if (itemtype == "5") {
+        state.QRtype = "5"
+      } else if (itemtype == "6") {
+        state.QRtype = "6"
+      } else if (itemtype == "7") {
+        state.QRtype = "7"
+      } else if (itemtype == "8") {
+        state.QRtype = "8"
+      } else if (itemtype == "9") {
+        state.QRtype = "9"
+      } else if (itemtype == "10") {
+        state.QRtype = "10"
+      } else if (itemtype == "11") {
+        state.QRtype = "11"
+      } else if (itemtype == "12") {
+        state.QRtype = "12"
+      }
     };
     const closeCopyModal = () => {
       state.copyModal = false;

From 8a57944e3a3f24324ea5bca602c8f950324c1f83 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Wed, 16 Nov 2022 19:32:22 +0800
Subject: [PATCH 53/90] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=A8=E7=BA=BF=20=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=20=20=E9=A1=B9=E7=9B=AE=E6=8A=BD=E5=B1=89?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=BF=E5=86=99=EF=BC=88=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=89=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=88=E7=AE=A1=E7=90=86=E6=94=B9=E4=BA=86=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/FaceManage.vue     | 64 +++++++++++++---
 src/components/drawers/WorkManage.vue     |  6 +-
 src/views/learningpath/LevelAddDetail.vue | 92 +++++++++++------------
 src/views/projectcenter/TaskPage.vue      | 53 +++++++------
 4 files changed, 129 insertions(+), 86 deletions(-)

diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 028d1c6c..317856a2 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【面授】管理</div>
+        <div class="headerTitle">【{{title}}】管理</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -71,7 +71,6 @@
             <div class="wz">导出数据</div>
           </div>
           <div class="btn btn2">
-            <div class="img2"></div>
             <div class="wz">导出作业</div>
           </div>
         </div>
@@ -166,6 +165,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    title: {
+      type: String,
+      default: "",
+    },
     projectTaskId: {
       type: Number,
       default: null,
@@ -203,16 +206,7 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [
-        // {
-        //   key: 1,
-        //   name: "哈哈",
-        //   bum: "产品部",
-        //   gangw: "产品经理",
-        //   score: "-",
-        //   state: "未完成",
-        // },
-      ],
+      tabledata: [],
       tablecolumns: [
         {
           title: "姓名",
@@ -254,8 +248,53 @@ export default {
           align: "center",
           className: "h",
         },
+        {
+          title: "操作",
+          dataIndex: "operation",
+          key: "operation",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
       ],
     });
+    //面授直播管理列表操作
+    const ListOpera = () => {
+      let arr = state.tabledata;
+      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
+      arr.map((value) => {
+        value.operation = (
+          <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="studentopea1"
+              onClick={() => {
+                console.log('---------')
+              }}
+            >  
+              查看作业
+            </div>
+
+            <div
+              class="studentopea2"
+              onClick={() => {
+                console.log( "--------");
+              }}
+            >
+              查看答卷
+            </div>
+          </div>
+        );
+      });
+      state.tabledata = arr;
+      console.log(state.tabledata,'++++++++++++-------------+++++++++-----------+++++++++++++++');
+    };
+    ListOpera();
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       state.projectName = value;
@@ -383,6 +422,7 @@ export default {
       onSelectChange,
       showModal,
       closeModal,
+      ListOpera, //渲染列表操作
       showEntryScore,
       showdoneModal,
       closedoneModal,
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index bfb1bea4..a448ac2a 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【作业】管理</div>
+        <div class="headerTitle">【{{title}}】管理</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -142,6 +142,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    title: {
+      type: String,
+      default: "",
+    },
     projectTaskId: {
       type: Number,
       default: null,
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 1621d781..fb4e885c 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -107,7 +107,6 @@
             <div class="items2">
               <div class="nname">{{ item.name }}</div>
             </div>
-           
           </div> -->
         </div>
       </div>
@@ -206,7 +205,7 @@
       </div>
       <div class="mid">
         <div class="item">
-          <div class="itcon">
+          <div class="itcon" @click="showDrawerAddOnline()">
             <div class="img">
               <img src="../../assets/images/leveladd/zai.png" />
             </div>
@@ -231,7 +230,7 @@
             <div class="lin"></div>
           </div>
           <div class="item">
-            <div class="itcon">
+            <div class="itcon" @click="showDrawerAddCase()">
               <div class="img">
                 <img src="../../assets/images/leveladd/an.png" />
               </div>
@@ -566,7 +565,7 @@
             </div>
           </div>
           <div class="draw" style="position: relative">
-            <a-drawer v-model:visible="addprojvisible" :isLevel="isLevel" class="drawerStyle ProjectDrawer" title="关联项目"
+            <a-drawer v-model:visible="addprojvisible" class="drawerStyle ProjectDrawer" title="关联项目"
               placement="right" width="80%" @after-visible-change="afterVisibleChange">
               <div class="drawerMain">
                 <div class="header">
@@ -785,6 +784,8 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
+import AddOnline from "../../components/drawers/AddOnline.vue"
+import AddCase from "../../components/drawers/AddCase.vue"
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
@@ -802,7 +803,6 @@ import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
 import * as apiProj from "../../api/indexInvist.js";
-import * as apiTask from "../../api/indexTaskadd";
 import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 export default {
@@ -810,6 +810,8 @@ export default {
   components: {
     AddStu,
     ImpStu,
+    AddOnline,
+    AddCase,
     AddHomework,
     AddDiscuss,
     AddActive,
@@ -1018,7 +1020,7 @@ export default {
       //   },
       // ],
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       pageSize: 10,
       visible: false,
       //项目
@@ -1036,7 +1038,9 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
-      EditWorkId: "", // 要编辑的 workid
+      EditOnlineId:"", // 要编辑的 workid
+      EditCaseId:"",
+      EditWorkId: "",
       EditTestId: "",
       EditRefId: "",
       EditLiveId: "",
@@ -1061,6 +1065,8 @@ export default {
       adddiscussvisible: false, //讨论抽屉
       isStudiscuss: false,
       addactivevisible: false, //活动抽屉
+      addonlinevisible:false,
+      addcasevisible:false,
       addhomeworkvisible: false,
       addtestvisible: false,
       addevalvisible: false,
@@ -1133,6 +1139,18 @@ export default {
       state.addprojvisible = false;
       state.isLevel = false;
     };
+    //在线抽屉
+    const showDrawerAddOnline = (id,eleId)=>{
+      state.addonlinevisible = true;
+      state.EditWorkId = id;
+      state.routerTaskId = eleId;
+    }
+    //案例抽屉
+    const showDrawerAddCase = (id,eleId)=>{
+      state.addcasevisible = true;
+      state.EditWorkId = id;
+      state.routerTaskId = eleId;
+    }
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
       console.log("homework==============", id, state.isactive);
@@ -1188,7 +1206,6 @@ export default {
     //打开项目抽屉
     const showDrawerAddProj = (id, eleId) => {
       state.addprojvisible = true;
-      state.isLevel = true;
       state.EditActiveId = id;
       state.routerTaskId = eleId;
     };
@@ -1368,23 +1385,11 @@ export default {
     };
 
     const drawertableColumns = () => {
-      // let arr = state.drawertableData;
-      // function traverse(arr) {
-      //   for (var a in arr) {
-      //     // console.log(arr[a]);
-      //     if (arr[a].children) {
-      //       traverse(arr[a].children); //递归遍历
-      //     } else {
-      // 			console.log(arr[a].children); //如果是值就显示
-
-      //     }
-      //   }
-      // }
-      // traverse(arr);
       const drawercolumns = [
         {
           title: "项目名称",
-          dataIndex: "projectName",
+          dataIndex: "name",
+          // dataIndex: "projectName",
           key: "projectName",
           width: 200,
           // align: "center",
@@ -1427,7 +1432,7 @@ export default {
 
         {
           title: "创建人",
-          dataIndex: "creater",
+          dataIndex: "creator",
           // width: "30%",
           key: "creater",
           width: 100,
@@ -1457,6 +1462,7 @@ export default {
         "rgb(245, 247, 250,1)";
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
       getDetail();
+      getAllProjText();
     });
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1627,7 +1633,11 @@ export default {
       } else if (type == "投票") {
         showDrawerAddVote(id, eleId);
       } else if (type == "项目") {
-        showDrawerAddVote(id, eleId);
+        showDrawerAddProj(id, eleId);
+      } else if (type == "在线") {
+        showDrawerAddOnline(id, eleId);
+      } else if (type == "案例") {
+        showDrawerAddCase(id, eleId);
       }
     };
     //删除关卡
@@ -1696,30 +1706,30 @@ export default {
         };
         array.push(obj);
       });
-      state.tableData = array;
+      state.drawertableData = array;
     };
     //获取全部项目信息接口
     const getAllProjText = () => {
       apiProj
         .queryAssessmentDetailList({
           assessmentName: "",
-          // pageNo: state.currentPage,
-          // pageSize: state.pageSize,
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
         })
         .then((res) => {
           let arr = res.data.data.rows;
           if (res.status === 200) {
             getTableDate(arr);
+            console.log('---------------项目信息---------------------------');
           }
         })
         .catch((err) => {
-          console.log("获取全部在线信息接口失败", err);
+          console.log("获取全部项目信息接口失败", err);
+          console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
           // state.createLoading = false;
         });
     };
     const updateTask = () => {
-      console.log("jinlaile=================", state.assessmentName)
-      if (state.isLevel) {
         RouterEditTask({
           chapterId: state.isactive,
           courseId: state.assessmentId,
@@ -1738,26 +1748,6 @@ export default {
           .catch((err) => {
             console.log(err, 1111);
           });
-      } else {
-        console.log("=========projectTaskId", state.projectTaskId);
-        apiTask
-          .addTask({
-            courseId: state.assessmentId,
-            name: state.assessmentName,
-            projectId: state.projectId,
-            projectTaskId: state.projectTaskId || 0,
-            stageId: state.chooseStageId,
-            type: 13,
-          })
-          .then((res) => {
-            console.log("调用项目添加接口后111", res.data, 11111);
-            // ctx.emit("changeData", false);
-            closeDrawer();
-          })
-          .catch((err) => {
-            console.log(err, 111111);
-          });
-      }
     }
     onMounted(() => {
       // createCase();
@@ -1784,6 +1774,8 @@ export default {
       drawertableColumns,
       editChapter,
       // updateChapter,
+      showDrawerAddOnline,
+      showDrawerAddCase,
       showDrawerAddHomework,
       showDrawerAddTest,
       showDrawerAddEval,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4da39841..b8cb21c0 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -431,17 +431,15 @@
                           item.type == '3' ||
                           item.type == '7' ||
                           item.type == '8' ||
-                          item.type == '6' ||
-                          item.type == '11' ||
-                          item.type == '12' ||
-                          item.type == '9'
+                          item.type == '9' ||
+                          item.type == '11'
                             ? showTime(item.name, item.projectTaskId)
                             : item.type == '5' || item.type == '10'
                             ? showTest(item.name, item.projectTaskId)
-                            : item.type == '2'
-                            ? showFace(item.projectTaskId)
+                            : item.type == '2' || item.type == '6'
+                            ? showFace(item.name,item.projectTaskId)
                             : item.type == '4'
-                            ? showWork(item.projectTaskId)
+                            ? showWork(item.name,item.projectTaskId)
                             : null
                         "
                       >
@@ -1031,6 +1029,7 @@
       v-model:Fvisible.sync="FaceVisivle"
       v-if="FaceVisivle"
       :projectTaskId="projectTaskId"
+      :title="showFaceText"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
@@ -1064,6 +1063,7 @@
       v-model:Wvisible.sync="Wvisible"
       v-if="Wvisible"
       :projectTaskId="projectTaskId"
+      :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
     <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" />
@@ -1075,12 +1075,12 @@
       <a-modal v-model:visible="pubproject" :title="null" @ok="closeModal" :footer="null" :closable="false" :centered="true"
         wrapClassName="pubproject" width="679px" height="437px">
         <div class="modalHeader" style="
-                            width: 100%;
-                            height: 68px;
-                            display: flex;
-                            align-items: center;
-                            justify-content: space-between;
-                          ">
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        ">
           <div class="headerLeft" style="margin-left: 32px">
             <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
             <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">项目发布</span>
@@ -1125,12 +1125,12 @@
         <a-modal v-model:visible="stugroup" :title="null" @ok="closeModal2" :footer="null" :closable="false" :centered="true"
           wrapClassName="doublepro" width="624px" height="332px">
           <div class="modalHeader" style="
-                            width: 100%;
-                            height: 68px;
-                            display: flex;
-                            align-items: center;
-                            justify-content: space-between;
-                          ">
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          ">
             <div class="headerLeft" style="margin-left: 32px">
               <span class="headerLeftText" style="font-size: 16px">创建小组</span>
             </div>
@@ -1994,13 +1994,18 @@ export default {
       ],
 
       taskSyllabusActive: 0,
-      //在线管理等页面传递参数
+      //在线管理等页面传递参数title
       showTimeText: "",
-      //考试、测评页面传递参数
+      //考试、测评页面传递参数title
       showTestText: "",
+      //直播、面授传递title
+      showFaceText:"",
+      //直播、面授传递title
+      showWorkText:"",
       //直播、活动页面传递参数
       showkaoqinText: "",
 
+
       //排行榜时间
       rankStartTime: null,
       rankEndTime: null,
@@ -2298,10 +2303,11 @@ export default {
       state.projectTaskId = id;
     };
     //新增
-    const showFace = (id) => {
+    const showFace = (name, id) => {
       //面授管理的抽屉
       // console.log("点击管理");
       state.FaceVisivle = true;
+      state.showFaceText = name;
       state.projectTaskId = id;
     };
     const showSubset = () => {
@@ -2324,8 +2330,9 @@ export default {
       state.showkaoqinText = "【" + course + "】" + "考勤";
     };
     //作业管理的抽屉
-    const showWork = (id) => {
+    const showWork = (name,id) => {
       state.Wvisible = true;
+      state.showWorkText = name;
       state.projectTaskId = id;
     };
     //考试管理的抽屉

From aa317a24398daf3696ed45108477ba3441eb3234 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Wed, 16 Nov 2022 19:57:26 +0800
Subject: [PATCH 54/90] =?UTF-8?q?fix:state=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index b21e5f26..918c39d7 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1269,7 +1269,6 @@ export default {
       time: undefined,
       assessmentId: null,
       assessmentName: "",
-      isLevel: false,
       projectId: null,
       projectTaskId: null,
       chooseStageId: null,

From 427a9fb83fc29d388c23411b08c9755b57ea452b Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 16 Nov 2022 21:29:54 +0800
Subject: [PATCH 55/90] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NavLeft.vue                | 72 ++++++++++++++++++
 src/views/examine/CourseReviewed.vue      | 39 ++++++++++
 src/views/examine/CourseReviewedN.vue     | 39 ++++++++++
 src/views/examine/ProjectReviewed.vue     | 39 ++++++++++
 src/views/examine/ProjectReviewedN.vue    | 38 ++++++++++
 src/views/learningpath/LearningPath.vue   |  6 ++
 src/views/projectcenter/ProjectManage.vue | 91 ++++++++++++-----------
 7 files changed, 279 insertions(+), 45 deletions(-)
 create mode 100644 src/views/examine/CourseReviewed.vue
 create mode 100644 src/views/examine/CourseReviewedN.vue
 create mode 100644 src/views/examine/ProjectReviewed.vue
 create mode 100644 src/views/examine/ProjectReviewedN.vue

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 4de7d2e9..b5dbbaeb 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -27,6 +27,54 @@
         @openChange="onOpenChange"
         @select="selectItem"
       >
+        <a-sub-menu key="sub10" @titleClick="titleClick">
+          <template #icon>
+            <div class="imgBox">
+              <img
+                style="width: 15px; height: 15px"
+                src="../assets/images/navleft/project.png"
+              />
+            </div>
+          </template>
+          <template #title>审核管理</template>
+          <a-menu-item key="sub10-1">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub10-1' ? true : false,
+                circle: selectedKeys[0] === 'sub10-1' ? false : true,
+              }"
+            ></span>
+            <router-link to="/coursereviewedn">待审核课程</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub10-2">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub10-2' ? true : false,
+                circle: selectedKeys[0] === 'sub10-2' ? false : true,
+              }"
+            ></span>
+            <router-link to="/coursereviewed">已审核课程</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub10-3">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub10-3' ? true : false,
+                circle: selectedKeys[0] === 'sub10-3' ? false : true,
+              }"
+            ></span>
+            <router-link to="/projecreviewedn">待审核项目</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub10-4">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub10-4' ? true : false,
+                circle: selectedKeys[0] === 'sub10-4' ? false : true,
+              }"
+            ></span>
+            <router-link to="/projecreviewed">已审核项目</router-link>
+          </a-menu-item>
+        </a-sub-menu>
+
         <a-menu-item key="sub1" @titleClick="titleClick">
           <div class="imgBox">
             <img
@@ -246,6 +294,30 @@ export default {
         : ["sub1"], //默认选择以及选择的二级导航
 
       keysList: [
+        {
+          href: "/coursereviewedn",
+          openKeys: "sub10",
+          selectedKeys: "sub10-1",
+          pagename: "待审核课程",
+        },
+        {
+          href: "/coursereviewed",
+          openKeys: "sub10",
+          selectedKeys: "sub10-2",
+          pagename: "已审核课程",
+        },
+        {
+          href: "/projectviewedn",
+          openKeys: "sub10",
+          selectedKeys: "sub10-3",
+          pagename: "待审核项目",
+        },
+        {
+          href: "/projectviewed",
+          openKeys: "sub10",
+          selectedKeys: "sub10-4",
+          pagename: "已审核项目",
+        },
         {
           href: "/learningpath",
           openKeys: "sub1",
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
new file mode 100644
index 00000000..bcfd1b1b
--- /dev/null
+++ b/src/views/examine/CourseReviewed.vue
@@ -0,0 +1,39 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-16 20:59:06
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-16 21:08:27
+ * @FilePath: /fe-manage/src/views/examine/CourseReviewed.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%A
+-->
+<!-- 已审核课程页面 -->
+<template>
+  <div class="coursereviewed">
+  
+  </div>
+</template>
+<script>
+import { reactive, toRefs, } from "vue";
+
+export default {
+  name: "CoursereViewed",
+
+  setup() {
+    const state = reactive({
+    
+    });
+
+   
+    return {
+      ...toRefs(state),
+      
+    };
+  },
+};
+</script>
+<style lang="scss">
+.coursereviewed {
+ 
+}
+
+</style>
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
new file mode 100644
index 00000000..d0635b09
--- /dev/null
+++ b/src/views/examine/CourseReviewedN.vue
@@ -0,0 +1,39 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-16 20:59:33
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-16 21:09:01
+ * @FilePath: /fe-manage/src/views/examine/CourseReviewedN.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<!-- 待审核课程页面 -->
+<template>
+  <div class="coursereviewedn">
+  
+  </div>
+</template>
+<script>
+import { reactive, toRefs, } from "vue";
+
+export default {
+  name: "CoursereViewedN",
+
+  setup() {
+    const state = reactive({
+    
+    });
+
+   
+    return {
+      ...toRefs(state),
+      
+    };
+  },
+};
+</script>
+<style lang="scss">
+.coursereviewedn {
+ 
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
new file mode 100644
index 00000000..845fdde4
--- /dev/null
+++ b/src/views/examine/ProjectReviewed.vue
@@ -0,0 +1,39 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-16 21:00:40
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-16 21:09:49
+ * @FilePath: /fe-manage/src/views/examine/ProjectReviewed.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<!-- 待审核课程页面 -->
+<template>
+  <div class="projectviewed">
+  
+  </div>
+</template>
+<script>
+import { reactive, toRefs, } from "vue";
+
+export default {
+  name: "ProjectViewed",
+
+  setup() {
+    const state = reactive({
+    
+    });
+
+   
+    return {
+      ...toRefs(state),
+      
+    };
+  },
+};
+</script>
+<style lang="scss">
+.projectviewed {
+ 
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
new file mode 100644
index 00000000..823c1640
--- /dev/null
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -0,0 +1,38 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-16 21:01:51
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-16 21:10:02
+ * @FilePath: /fe-manage/src/views/examine/ProjectReviewedN.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="projectviewedn">
+  
+  </div>
+</template>
+<script>
+import { reactive, toRefs, } from "vue";
+
+export default {
+  name: "ProjectViewedN",
+
+  setup() {
+    const state = reactive({
+    
+    });
+
+   
+    return {
+      ...toRefs(state),
+      
+    };
+  },
+};
+</script>
+<style lang="scss">
+.projectviewedn {
+ 
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 6246c580..facaf22e 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -323,6 +323,12 @@
               >
                 <!-- <img class="im" :src="item.source" /> -->
               </div>
+              <div
+                @click="showImgMore"
+                v-if="imgData.length>=5"
+                class="learnBgItem">
+                <!-- <img class="im" :src="item.source" /> -->
+              </div>
             </div>
           </div>
           <div class="info">
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index b08b5620..51607e06 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -2669,52 +2669,53 @@ export default {
                   编辑
                 </span>
               ) : (
-                 <span
-                  onClick={() => {
-                    console.log("单层子项目的编辑");
-                    console.log(value);
+                <span class="operation1"></span>
+                //  <span
+                //   onClick={() => {
+                //     console.log("单层子项目的编辑");
+                //     console.log(value);
 
-                    {
-                      /* 判断是班级\单层项目\单层子项目 */
-                    }
-                    if (value.record.parentId == "0") {
-                      router.push({
-                        path: "/projectadd",
-                        query: {
-                          projectId: value.record.projectId,
-                          name: value.record.name,
-                           viewDetail:1,
-                        },
-                      });
-                    } else {
-                      if (value.record.isbj) {
-                        router.push({
-                          path: "/classadd",
-                          query: {
-                            projectId: value.record.projectId,
-                            name: value.record.paraentName,
-                            edit: 0,
-                            viewDetail:1,
-                          },
-                        });
-                      } else {
-                        router.push({
-                          path: "/sonproject",
-                          query: {
-                            projectId: value.record.projectId,
-                            name: value.record.paraentName,
-                            edit: 0,
-                            viewDetail:1,
-                          },
-                        });
-                      }
-                    }
-                  }}
-                  style="cursor:pointer;"
-                  class="operation1"
-                >
-                  查看
-                </span>
+                //     {
+                //       /* 判断是班级\单层项目\单层子项目 */
+                //     }
+                //     if (value.record.parentId == "0") {
+                //       router.push({
+                //         path: "/projectadd",
+                //         query: {
+                //           projectId: value.record.projectId,
+                //           name: value.record.name,
+                //            viewDetail:1,
+                //         },
+                //       });
+                //     } else {
+                //       if (value.record.isbj) {
+                //         router.push({
+                //           path: "/classadd",
+                //           query: {
+                //             projectId: value.record.projectId,
+                //             name: value.record.paraentName,
+                //             edit: 0,
+                //             viewDetail:1,
+                //           },
+                //         });
+                //       } else {
+                //         router.push({
+                //           path: "/sonproject",
+                //           query: {
+                //             projectId: value.record.projectId,
+                //             name: value.record.paraentName,
+                //             edit: 0,
+                //             viewDetail:1,
+                //           },
+                //         });
+                //       }
+                //     }
+                //   }}
+                //   style="cursor:pointer;"
+                //   class="operation1"
+                // >
+                //   查看
+                // </span>
               )}
               <div class="tableSelect">
                 <a-select

From ea5384632d7f21efb3b93c465c374db209577c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Thu, 17 Nov 2022 09:26:30 +0800
Subject: [PATCH 56/90] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ AssessmentList.vue |   1 -
 src/components/drawers/AddInvist.vue       |   3 +
 src/components/drawers/AddTest.vue         |   9 +-
 src/components/drawers/AddVote1.vue        |  25 +-
 src/components/vote/AddVote.vue            |   6 +-
 src/components/vote/CreateVote.vue         | 788 ++++++++++-----------
 6 files changed, 418 insertions(+), 414 deletions(-)

diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
index 3669d29c..ab7d1fff 100644
--- a/src/components/drawers/ AssessmentList.vue	
+++ b/src/components/drawers/ AssessmentList.vue	
@@ -97,7 +97,6 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:assessmentVisible", false);
-      
     };
     const afterVisibleChange = (bool) => {
       console.log("state getAllInvistText", bool);
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 57fa3d0e..f7140bef 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -145,6 +145,9 @@ export default {
     }
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      state.assessmentId=null;
+      state.assessmentName="";
+      state.assessment=null;
     };
 
     const updateTask =()=>{
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index fbd6c832..2f7d1ff7 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -17,9 +17,9 @@
       </div>
       <div style="display: flex; flex-direction: row">
         <a-button style="width:100px;"
-        @click="()=>{isOuter = 1}"
+        @click="changeOuter(1)"
          :class="[isOuter == 1? 'outer' : '' ]">系统考试</a-button>
-      <a-button style="width:100px;" @click="()=>{isOuter = 2}"
+      <a-button style="width:100px;" @click="changeOuter(2)"
        :class="[isOuter == 2? 'outer' : '' ]" >外部考试</a-button>
       </div>
       <a-form
@@ -551,6 +551,10 @@ export default {
         formState.questionArrangement = "";
       }
     }
+    const changeOuter = (value) => {
+      console.log(value)
+      state.isOuter = value
+    }
     return {
       formState,
       afterVisibleChange,
@@ -569,6 +573,7 @@ export default {
       rules,
       updateTest,
       queryTest,
+      changeOuter,
       ...toRefs(state)
     };
   },
diff --git a/src/components/drawers/AddVote1.vue b/src/components/drawers/AddVote1.vue
index f91322d2..1521159a 100644
--- a/src/components/drawers/AddVote1.vue
+++ b/src/components/drawers/AddVote1.vue
@@ -40,7 +40,7 @@
             />
             <div class="votename">创建投票：</div>
           </div>
-          <div class="votebtn">创建投票</div>
+          <div class="votebtn" @click="showVoteDrawer">创建投票</div>
         </div>
         <!-- 创建投票 -->
         <!-- 起止时间 -->
@@ -135,6 +135,17 @@
       </div>
     </div>
   </a-drawer>
+    <a-drawer
+      v-model:visible="voteDrawerShow"
+      class="custom-class"
+      title="创建投票"
+      placement="right"
+      @after-visible-change="afterVoteVisibleChange"
+    >
+      <p>Some contents...</p>
+      <p>Some contents...</p>
+      <p>Some contents...</p>
+    </a-drawer>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -147,7 +158,9 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({});
+    const state = reactive({
+      voteDrawerShow:false,
+    });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
     };
@@ -160,12 +173,20 @@ export default {
       state.visible = true;
     };
 
+    const showVoteDrawer = () => {
+      state.voteDrawerShow = true;
+    }
+    const afterVoteVisibleChange = () => {
+
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       showDrawer,
       closeDrawer,
       // change,
+      showVoteDrawer,
+      afterVoteVisibleChange
     };
   },
 };
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 812d5f18..ed6c398f 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -79,7 +79,7 @@
             </div>
             <!-- 创建投票侧弹窗 -->
             <div>
-              <cre-vote
+              <create-vote
                 v-model:crevoteVisible="crevotevisible"
                 @getData="getStemId"
                 v-model:ballotId="ballotId"
@@ -136,7 +136,7 @@
 </template>
 <script>
 import { reactive, toRefs} from "vue";
-import CreVote from "./CreateVote.vue";
+import CreateVote from "./CreateVote.vue";
 import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
 import { RouterEditTask } from "@/api/indexTask";
@@ -147,7 +147,7 @@ import * as apiTask from "../../api/indexTaskadd";
 export default {
   name: "AddVote",
   components: {
-    CreVote,
+    CreateVote,
   },
   props: {
     addvoteVisible: {
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index e79d4b4d..16563461 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -1,209 +1,168 @@
 <!-- 评估管理-创建评估页面 -->
 <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">
+  <a-drawer :visible="createVoteVisible" class="drawerStyle createvoteDrawer" width="100%" 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=""
-              />
+              <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"
-            />
+            <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 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 class="btnbox">
-        <button
-          class="xkbtn"
-          @click="handleTypes"
-        >
-          创建题干
-        </button>
-      </div>
-    </div> <!-- 创建投票侧弹窗 -->
-  </div>
-  <div v-for="(item, index) in allFormsData" :key="index">
-    <VoteQuestion
-      :item="item"
-      :ballotId="ballotId"
-      @del="handleDel"
-      
-    />
-    
-  </div>
+      <div v-for="(item, index) in allFormsData" :key="index">
+        <VoteQuestion :item="item" :ballotId="ballotId" @del="handleDel" />
 
-  <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 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>
-  </div>
-</div>
-</a-drawer>
+  </a-drawer>
 </template>
 <script>
-import { reactive,toRefs} from "vue";
+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,
+  // sortBy,
+  traverseArr,
+  // filterCommon,
+  // deepCloneFilterString,
 } from "../../utils/utils";
 
 
 //import store from "@/store";
-import {
-//createOptionMessage,
-queryStemByStemId
-}from "@/api/indexVote";
-import {
-
-
-
-
-} from "@/api/indexResearch";
+import * as api from "@/api/indexVote";
+import {} from "@/api/indexResearch";
 //import { message } from "ant-design-vue";
 
 
 export default {
-name: "CreateVote",
-components: {
-  VoteQuestion,
+  name: "CreateVote",
+  components: {
+    VoteQuestion,
 
-},
-props: {
-  createVoteVisible: {
-    type: Boolean,
-    default: false,
   },
-  ballotId: {
-    type: Number,
-    default: null,
-  },
-  editChild: {
-    type: Boolean,
-    default: false,
-  },
-  
-},
-setup(props,ctx) {
-  const state = reactive({
-    ballotId: "", 
-    ballotName: "",
-    allFormsData: [],
+  props: {
+    createVoteVisible: {
+      type: Boolean,
+      default: false,
+    },
+    ballotId: {
+      type: Number,
+      default: null,
+    },
+    editChild: {
+      type: Boolean,
+      default: false,
+    },
 
-  });
-  const afterVisibleChange = (bool) => {
-    console.log("state======进来creates", bool);
-    handleTypes();
-  };
-  const closeDrawer = () => {
-    ctx.emit("update:createVoteVisible", false);
-    
-    console.log("======关闭");
-  }
-  // 详情
-  const getInfoDate = async () => {
-    if (props.editChild) {
-      //stemId 多余字段
-      let res = await queryStemByStemId({stemId:0,
-        ballotId: state.ballotId,
-      }).then((res) => {
-        if (res.data.code === 200) {
-          return res.data.data;
-        }
-      });
-      state.ballotName = res[0].ballotId;
-      let renderArr = [
-        ...res,
-      ];
-      // sortBy(renderArr, "orderNumber"); //序号
-      state.allFormsData = parseData(renderArr); //类型
-      // console.log("state.allFormsData");
-      // console.log(state.allFormsData);
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      ballotId: "",
+      ballotName: "",
+      allFormsData: [],
+
+    });
+    const afterVisibleChange = (bool) => {
+      console.log("state======进来creates", bool);
+      handleTypes();
+    };
+    const closeDrawer = () => {
+      ctx.emit("update:createVoteVisible", false);
+
+      console.log("======关闭");
     }
-  };
-  getInfoDate();
+    // 详情
+    const getInfoDate = async () => {
+      if (props.editChild) {
+        //stemId 多余字段
+        let res = await api.queryStemByStemId({
+          stemId: 0,
+          ballotId: state.ballotId,
+        }).then((res) => {
+          if (res.data.code === 200) {
+            return res.data.data;
+          }
+        });
+        state.ballotName = res[0].ballotId;
+        let renderArr = [
+          ...res,
+        ];
+        // sortBy(renderArr, "orderNumber"); //序号
+        state.allFormsData = parseData(renderArr); //类型
+        // console.log("state.allFormsData");
+        // console.log(state.allFormsData);
+      }
+    };
+    getInfoDate();
 
-  // 转换成前端格式
-  const parseData = (arr) => {
-    const resultArr = [];
-    arr.forEach((item) => {
-      let obj = {};
-      let restList = traverseArr(item.optionDetailList, {
-        inputVal: "singleOptionName",
-        imgVal: "singleOptionPictureAddress",
-        optionId: "singleOptionId",
-      }).map((itm, idx) => {
+    // 转换成前端格式
+    const parseData = (arr) => {
+      const resultArr = [];
+      arr.forEach((item) => {
+        let obj = {};
+        let restList = traverseArr(item.optionDetailList, {
+          inputVal: "singleOptionName",
+          imgVal: "singleOptionPictureAddress",
+          optionId: "singleOptionId",
+        }).map((itm, idx) => {
+          itm.id = idx + 1;
+          return itm;
+        });
+
+        obj = {
+          voteStemName: item.singleStemName,
+          singleList: restList,
+        };
+        resultArr.push(obj);
+
+
+      });
+      resultArr.map((itm, idx) => {
         itm.id = idx + 1;
         return itm;
       });
-
-      obj = {
-        voteStemName: item.singleStemName,
-        singleList: restList,
-      };
-      resultArr.push(obj);
-      
-
-    });
-    resultArr.map((itm, idx) => {
-      itm.id = idx + 1;
-      return itm;
-    });
-    return resultArr;
-  };
+      return resultArr;
+    };
     /**
   // 转换成后端格式
   const restData = (arr, typeKey) => {
@@ -334,168 +293,166 @@ setup(props,ctx) {
   };
 
 */
-  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 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);
 
-  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.ballotId) {
-      resultPost = {
-        ballotId: state.ballotId,
-        ballotName: state.ballotName,
-        ...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 = {
-        ballotName: state.ballotNameNew,
-        assessmentMark: state.valueMore,
-        ...filterData,
-      };
-      resultPost = deepCloneFilterString(resultPost, [
-        "assessmentMaxScore",
-        "assessmentMinScore",
-      ]);
-      createOptionMessage(resultPost).then((res) => {
-        if (res.data.code === 200) {
-          message.success("创建成功");
-        
-        }
-      });
-    }
-    */
-  };
-  const handleAllCancel = () => {
-    state.allFormsData = [];
-  
-  };
-  /** 
-  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("当前权重设置是百分制 请重新配置");
+    const handleSave = () => {
+      /** 
+      let resultPost = {};
+      
+      let filterData = parseItem(restData(state.allFormsData, "type"));
+      // 校验
+      if (!checkVal(filterData)) {
         return false;
       }
-    }
-    // 单选
-    if (
-      filterData.assessmentSingleChoiceDtoList &&
-      filterData.assessmentSingleChoiceDtoList.length
-    ) {
-      let arr = filterData.assessmentSingleChoiceDtoList;
-      for (let item of arr) {
-        if (!item.singleStemName) {
-          message.error("单选题干为必填 请确认");
+      console.log(12121212);
+      console.log(filterData);
+  
+      if (state.ballotId) {
+        resultPost = {
+          ballotId: state.ballotId,
+          ballotName: state.ballotName,
+          ...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 = {
+          ballotName: state.ballotNameNew,
+          assessmentMark: state.valueMore,
+          ...filterData,
+        };
+        resultPost = deepCloneFilterString(resultPost, [
+          "assessmentMaxScore",
+          "assessmentMinScore",
+        ]);
+        createOptionMessage(resultPost).then((res) => {
+          if (res.data.code === 200) {
+            message.success("创建成功");
+          
+          }
+        });
+      }
+      */
+    };
+    const handleAllCancel = () => {
+      state.allFormsData = [];
+
+    };
+    /** 
+    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;
         }
       }
-    }
-    return true;
-  };
-  */
+      // 单选
+      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,
-  };
-},
+    return {
+      ...toRefs(state),
+      handleTypes,
+      handleSave,
+      handleAllCancel,
+      handleDel,
+      afterVisibleChange,
+      closeDrawer,
+    };
+  },
 };
 </script>
 <style lang="scss">
@@ -508,6 +465,7 @@ setup(props,ctx) {
     align-items: center;
     flex-shrink: 0;
     margin-bottom: 25px;
+
     .headerTitle {
       font-size: 18px;
       font-weight: 600;
@@ -516,105 +474,123 @@ setup(props,ctx) {
       margin-left: 24px;
     }
   }
+
   .main_left {
-      padding-right: 30px;
-      flex: 1;
-      border-right: 1px solid #e8e8e8;
-      .main_item {
+    margin-left: 50px;
+    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;
-        margin-bottom: 32px;
-        .signbox {
-          width: 120px;
+
+        .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;
-          justify-content: end;
           align-items: center;
-          .sign {
+          padding: 3px 5px;
+          background-color: rgba(42, 103, 209, 0.4);
+
+          span {
             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;
+
+          .delBox {
+            width: 13px;
+            height: 13px;
+            background-image: url(@/assets/images/basicinfo/ch.png);
+            background-size: 100% 100%;
+            border-radius: 50%;
           }
-          .fileTigan {
+        }
+      }
+    }
+
+    .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;
-            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%;
-            }
+            flex-wrap: nowrap;
           }
         }
       }
-      .main_item2 {
+
+      .btnbox2 {
         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;
-          }
+        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;
         }
       }
+    }
   }
 
 }

From c926de3526c558b62eaaa3080020ea48c7d46fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Thu, 17 Nov 2022 10:00:32 +0800
Subject: [PATCH 57/90] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=20=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E5=8F=91=E5=B8=83=E6=92=A4=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=A4=8D=E5=88=B6=E5=AD=98=E4=B8=BA=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 282 +++++-----
 src/components/drawers/SelFacet.vue     |  37 +-
 src/views/learningpath/LearningPath.vue |  73 ++-
 src/views/learningpath/LevelAdd.vue     | 530 ++++++++++++++++++-
 src/views/projectcenter/TaskPage.vue    | 671 +++++++++++++++++++++++-
 5 files changed, 1392 insertions(+), 201 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 63c19be7..25a37258 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -48,11 +48,14 @@
               <span style="margin-right: 3px">选择课程：</span>
             </div>
             <div class="btnbox" @click="showDrawerSelFacet">
-              <button class="xkbtn">选择课程</button>
+              <button class="xkbtn">授课课程</button>
             </div>
             <!-- 选择面授侧弹窗 -->
             <div>
-              <sel-facet v-model:selfacetVisible="selfacetvisible" />
+              <sel-facet
+                v-model:selfacetVisible="selfacetvisible"
+                @getData="upDateTable"
+              />
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
@@ -152,8 +155,15 @@
                 <div class="timerbox">
                   <span>开始前：</span>
                   <a-input-number
-                    :min="0" :max="30" :precision="0"
-                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     :v-model:value="inputV5"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -161,29 +171,43 @@
                 <div class="timerbox">
                   <span>开始后：</span>
                   <a-input-number
-                    :min="0" :max="30" :precision="0"
-                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     :v-model:value="inputV6"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
-              <div class="qdqtbox">
+              <!-- <div class="qdqtbox">
                 <div class="qtbtn"><div class="btntext">签退</div></div>
-              </div>
-              <div class="setbox">
+              </div> -->
+              <!-- <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
                   <a-input-number
-                    :min="0" :max="30" :precision="0"
-                    style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     :v-model:value="inputV7"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
                     >分钟（提前签退则记为早退）</span
                   >
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
           <div class="main_item">
@@ -192,7 +216,9 @@
             </div>
             <div class="btnbox">
               <a-radio-group v-model:value="radioV1">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio1">仅签到</a-radio>
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >仅签到</a-radio
+                >
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >签到、签退全部完成</a-radio
                 >
@@ -215,7 +241,9 @@
             </div>
             <div class="btnbox2">
               <a-radio-group v-model:value="radioV2">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许项目内人员临时到场参加</a-radio>
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
+                  >允许项目内人员临时到场参加</a-radio
+                >
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
                   >允许项目外人员临时到场参加</a-radio
                 >
@@ -228,7 +256,7 @@
             </div>
             <div class="btnbox2">
               <a-checkbox v-model:checked="checked">需要评估</a-checkbox>
-              <button class="xkbtn">选择课程</button>
+              <button class="xkbtn">选择评估</button>
             </div>
           </div>
         </div>
@@ -271,13 +299,13 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2" @click ="updateFaceTeach">确定</button>
+        <button class="btn2" @click="updateFaceTeach">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import SelFacet from "../../components/drawers/SelFacet.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
@@ -359,7 +387,7 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      if(bool){
+      if (bool) {
         queryFaceTeach();
       }
     };
@@ -381,19 +409,16 @@ export default {
       if (value != "") {
         state.radioV2 = "";
       }
-    }
+    };
     //查询面授
-    const queryFaceTeach=()=>{
-
-    }
-     //更新任务列表
-     const updateTask=()=>{
-
-    }
-     //新建或编辑面授
-     const updateFaceTeach=()=>{
-    
-    }
+    const queryFaceTeach = () => {};
+    //更新任务列表
+    const updateTask = () => {};
+    //新建或编辑面授
+    const updateFaceTeach = () => {};
+    const upDateTable = (data) => {
+      console.log("选择了课程", data);
+    };
     return {
       ...toRefs(state),
       showDrawerSelFacet,
@@ -405,6 +430,7 @@ export default {
       cloradio2,
       updateFaceTeach,
       updateTask,
+      upDateTable,
       // change,
     };
   },
@@ -443,115 +469,115 @@ export default {
           display: flex;
           align-items: center;
           margin-top: 32px;
-            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-bottom: 32px;
+
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+
+            .sign {
+              margin-right: 5px;
             }
           }
-          
-          .main_item2 {
+
+          .btnbox {
             display: flex;
-            align-items: flex-start;
-            margin-bottom: 32px;
-          
-            .signbox {
-              width: 120px;
-              display: flex;
-              justify-content: end;
-              align-items: center;
+            flex: 1;
+            align-items: center;
+
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #388be1;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              color: #fff;
             }
-          
-            .kqszbox {
-              .qdqtbox {
-                margin-left: 5px;
-                cursor: pointer;
+          }
+        }
+
+        .main_item2 {
+          display: flex;
+          align-items: flex-start;
+          // margin-bottom: 32px;
+
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
+          }
+
+          .kqszbox {
+            .qdqtbox {
+              margin-left: 5px;
+              cursor: pointer;
+            }
+
+            .qdbtn,
+            .qtbtn {
+              width: 75px;
+              height: 24px;
+              background: rgba(56, 139, 225, 0.16);
+              border-radius: 2px;
+              border: 1px solid #387df7;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+
+              .btntext {
+                color: #387df7;
               }
-          
-              .qdbtn,
-              .qtbtn {
-                width: 75px;
-                height: 24px;
-                background: rgba(56, 139, 225, 0.16);
-                border-radius: 2px;
-                border: 1px solid #387df7;
+            }
+
+            .setbox {
+              display: flex;
+              flex-wrap: wrap;
+              margin-top: 10px;
+              // margin-bottom: 24px;
+
+              .timerbox {
+                margin-top: 6px;
+                margin-right: 32px;
                 display: flex;
                 align-items: center;
-                justify-content: center;
-          
-                .btntext {
-                  color: #387df7;
-                }
-              }
-          
-              .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;
+                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_right {
-            width: 337px;
-          
-            .main_item {
-              display: flex;
-              align-items: center;
-              margin-top: 32px;
+        }
+      }
+
+      .main_right {
+        width: 337px;
+
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index dc442258..92941fe6 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -63,7 +63,11 @@
             :row-class-name="
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
             "
-            :row-selection="rowSelection"
+            :row-selection="{
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+              type: 'radio',
+            }"
             :columns="columns1"
             :data-source="classTableData"
             :loading="tableDataTotal === -1 ? true : false"
@@ -86,7 +90,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -150,22 +154,7 @@ const columns1 = [
     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);
-  },
-});
+
 export default {
   name: "SelFacet",
   props: {
@@ -219,9 +208,19 @@ export default {
       pageSize: 10,
       valueClass: null, //课程编号
       valueContent: null, //内容分类
+      selectedRows: [], //选择的数据
+      selectedRowKeys: [],
     });
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+
+      state.selectedRowKeys = selectedRowKeys;
+      state.selectedRows = selectedRows;
+      console.log(selectedRows);
+    };
     const closeDrawer = () => {
       ctx.emit("update:selfacetVisible", false);
+      ctx.emit("getData", state.selectedRows);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -313,13 +312,13 @@ export default {
       closeDrawer,
       options1,
       columns1,
-      rowSelection,
       getClassData,
       handleChange,
       reset,
       getClassList,
       search,
       changePaginationStu,
+      onSelectChange,
       // change,
     };
   },
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 0221c0fe..142f9a95 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -40,11 +40,11 @@
         <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1" @click="searchLearnPath">
             <div class="search"></div>
-            <div class="btnText" >搜索</div>
+            <div class="btnText">搜索</div>
           </div>
           <div class="btnn btn2" @click="resetLearnPath">
             <div class="search"></div>
-            <div class="btnText" >重置</div>
+            <div class="btnText">重置</div>
           </div>
         </div>
       </div>
@@ -196,7 +196,7 @@
                 @click="chooseImg(item)"
                 v-for="item in imgData"
                 :key="item.key"
-               class="learnBgItem"
+                class="learnBgItem"
                 :style="{
                   border:
                     learnPathBg === item.id
@@ -263,7 +263,7 @@
                 v-model:value="pathName"
                 maxlength="20"
                 style="border-radius: 4px"
-                 placeholder="请输入学习路径名称"
+                placeholder="请输入学习路径名称"
               />
               <div class="showcount">{{ pathName.length }}/20</div>
             </div>
@@ -431,10 +431,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="delete_exit">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="delete_exit">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -465,16 +465,16 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeStopModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="stopLearnPath">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
       </div>
     </a-modal>
-    <!-- 结束路径弹窗 -->
+    <!-- 删除路径弹窗 -->
     <a-modal
       v-model:visible="deleteModal"
       :footer="null"
@@ -495,10 +495,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteLearnPath">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -525,10 +525,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="delete_exit">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="delete_exit">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -556,10 +556,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeBackModal">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="recallPath">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -1143,7 +1143,7 @@ export default {
                           复制
                         </div>
                       </a-select-option>
-                     
+
                       <a-select-option
                         value="删除"
                         label="删除"
@@ -1197,20 +1197,20 @@ export default {
                             撤回
                           </div>
                         </a-select-option>
-                         <a-select-option
-                        value="结束"
-                        label="结束"
-                        style="padding-left:35px"
-                      >
-                        <div
-                          onClick={() => {
-                            state.stopPathId = text.record.id;
-                            showStopModal();
-                          }}
+                        <a-select-option
+                          value="结束"
+                          label="结束"
+                          style="padding-left:35px"
                         >
-                          结束
-                        </div>
-                      </a-select-option>
+                          <div
+                            onClick={() => {
+                              state.stopPathId = text.record.id;
+                              showStopModal();
+                            }}
+                          >
+                            结束
+                          </div>
+                        </a-select-option>
                       </a-select>
                     </div>
                   ) : (
@@ -1322,7 +1322,7 @@ export default {
                 state.lpLoading = false;
                 state.currentPage = 1;
                 router.push("/leveladd");
-                 storage.set("routerId", res.data.data.routerId);
+                storage.set("routerId", res.data.data.routerId);
                 // getLearnPath();
               }, commonData.timeout);
             })
@@ -1645,20 +1645,19 @@ export default {
                   cursor: pointer;
                 }
               }
-              .learnBg{
+              .learnBg {
                 display: flex;
                 flex-wrap: wrap;
                 min-height: 110px;
-              .learnBgItem{
-                 border-radius: 8px;
+                .learnBgItem {
+                  border-radius: 8px;
                   width: 136px;
                   height: 106px;
                   background-size: 100%;
                   background-repeat: no-repeat;
-                   margin-bottom: 20px;
-                     margin-right: 6px;
-              }
-               
+                  margin-bottom: 20px;
+                  margin-right: 6px;
+                }
               }
             }
             .info {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index cba94412..ef07b558 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2,7 +2,8 @@
   <div class="addwrapper">
     <div class="addhead">
       <div class="leftimg">
-        <img class="img" :src="picUrl" />
+        <!-- <img class="img" :src="picUrl" /> -->
+        <img class="img" src="../../assets/images/leveladd/1.png" />
       </div>
       <div class="imgfor">
         <div class="forz">{{ styTitle }}</div>
@@ -12,19 +13,59 @@
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
         <div class="line"></div>
         <img class="img2" src="../../assets/images/leveladd/pub.png" />
-        <div class="pub">发布</div>
+        <!-- 已发布的显示 -->
+        <div
+          class="pub"
+          style="width: 28px"
+          v-if="action == 1"
+          @click="showBackModal"
+        >
+          {{ act }}
+        </div>
+        <!-- 未发布/草稿的显示 -->
+        <div
+          class="pub"
+          style="width: 28px"
+          v-if="action == 0"
+          @click="showPub"
+        >
+          {{ act }}
+        </div>
+        <!-- 已结束的显示 -->
+        <div class="pub" style="width: 28px" v-if="action == -1">
+          {{ act }}
+        </div>
         <div class="line"></div>
         <img
           style="margin-right: 15px"
           class="img2"
           src="../../assets/images/leveladd/more.png"
         />
-        <div class="more">
+        <!-- 草稿/未发布的显示 -->
+        <div class="more" v-if="action == 0">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
           <div class="moreItems">
-            <div class="sammo">撤回</div>
-            <div class="sammo">复制</div>
+            <!-- <div class="sammo">撤回</div> -->
+            <div class="sammo" @click="showCopy">复制</div>
+          </div>
+        </div>
+        <!-- 已发布的显示 -->
+        <div class="more" v-if="action == 1">
+          <span style="color: #7096e3; cursor: pointer">更多</span>
+          <div class="moreArrow"></div>
+          <div class="moreItems">
+            <div class="sammo" @click="showStop">结束</div>
+            <div class="sammo" @click="showCopy">复制</div>
+          </div>
+        </div>
+        <!-- 已结束的显示 -->
+        <div class="more" v-if="action == -1">
+          <span style="color: #7096e3; cursor: pointer">更多</span>
+          <div class="moreArrow"></div>
+          <div class="moreItems">
+            <!-- <div class="sammo">结束</div> -->
+            <div class="sammo" @click="showCopy">复制</div>
           </div>
         </div>
         <div class="line"></div>
@@ -920,6 +961,172 @@
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
       <a-spin :spinning="addLoading" tip="添加中..." />
     </div>
+    <!-- 发布弹窗 -->
+    <a-modal
+      v-model:visible="pub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="pub"
+      width="679px"
+      height="437px"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div class="headerLeft" style="margin-left: 32px">
+          <span style="width: 15px; height: 15px"
+            ><img src="../../assets/images/taskpage/pub.png"
+          /></span>
+          <span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >路径发布</span
+          >
+        </div>
+        <div style="cursor: pointer; margin-right: 32px" @click="closePub">
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
+          />
+        </div>
+      </div>
+      <div class="modalMain">
+        <div class="projectname">产品经理上升路径</div>
+        <!-- <div class="projecttime">
+          <span class="timeti">路径时间：</span
+          ><span class="timeme">2022/08/01-2022/08/30</span>
+        </div> -->
+        <div class="projectbox">
+          <div class="promessage">
+            <div class="messageme">路径信息</div>
+            <div class="messagege">当前路径共0个关卡，0个任务</div>
+          </div>
+          <div class="stumessage">
+            <div class="messageme1">学员信息</div>
+            <div class="messagege1">路径共{{ routeStudentsNum }}名学员</div>
+          </div>
+        </div>
+        <!-- <div class="send">
+          <a-switch v-model:checked="checked" size="small" />
+          <span class="sendtext">发送路径通知</span>
+        </div>
+        <div class="ckb">
+          <a-checkbox v-model:checked="checkedTeacher"
+            ><span class="sendpeo">发给老师</span></a-checkbox
+          >
+          <a-checkbox v-model:checked="checkStu"
+            ><span class="sendpeo">发给学员</span></a-checkbox
+          >
+        </div> -->
+        <div class="pubtn">
+          <a-button class="pubtn1" @click="closePub">取消</a-button>
+          <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 撤回路径弹窗 -->
+    <a-modal
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      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="closeBackModal"></div>
+          </div>
+          <div class="body">
+            <span>是否撤回路径</span>
+            <div class="back">（路径撤回后学员进度保留，发布后可继续学习）</div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeBackModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="recallPath">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 复制路径弹窗 -->
+    <a-modal
+      v-model:visible="dcopyModal"
+      :footer="null"
+      :closable="dcloseCopy"
+      wrapClassName="CopyModal"
+      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="closeCopy"></div>
+          </div>
+          <div class="body">
+            <span>您确定要复制此路径吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeCopy">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="sureCopy">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 结束路径弹窗 -->
+    <a-modal
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="dicloseStop"
+      wrapClassName="CopyModal"
+      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="closeStopModal"></div>
+          </div>
+          <div class="body">
+            <!-- <span>您确定要停用此路径吗</span> -->
+            <span>是否结束项目</span>
+            <div class="back">
+              （项目结束后学员将无法继续学习，此操作不可逆）
+            </div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeStopModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="stopLearnPath">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -942,6 +1149,7 @@ import { getRouterOverview } from "@/api/indexLearningPath";
 import { GetRouterDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
 import { toDate } from "../../api/method";
+import { handleLearnPath } from "../../api/index1";
 
 export default {
   name: "LevelAdd",
@@ -981,6 +1189,8 @@ export default {
       styTitle: null,
       cretime: null,
       picUrl: null,
+      action: null,
+      act: null,
       // 共享文档列表
       docList: [
         {
@@ -1046,6 +1256,14 @@ export default {
       visible: false, //时间管理
       TMvisible: false, //考试管理
       FaceVisivle: false, //面授管理
+      pub: false, //发布弹窗
+      backModal: false, //撤回弹窗
+      dcopyModal: false, //复制弹窗
+      closeBack: false,
+      routeStudentsNum: null,
+      dcloseCopy: false,
+      dicloseCopy: false,
+      stopModal: false, //结束弹窗
       //关卡的数据
       level: [
         // {
@@ -1386,14 +1604,7 @@ export default {
     onMounted(() => {
       state.addLoading = true;
       getOverview();
-      GetRouterDetail(state.routerId).then((res) => {
-        state.styTitle = res.data.data.routerInfo.name;
-        state.cretime = toDate(
-          res.data.data.routerInfo.createTime / 1000,
-          "Y-M-D h:m"
-        );
-        state.picUrl = res.data.data.routerInfo.picUrl;
-      });
+      reget();
     });
 
     // 获取项目概览
@@ -1478,6 +1689,147 @@ export default {
         },
       });
     };
+    const closePub = () => {
+      state.pub = false;
+    };
+
+    //确定发布
+    const releaseLearnPath = () => {
+      // console.log("state.releasePathId", state.releasePathId);
+      let obj = {
+        routerId: state.routerId,
+        type: 1,
+      };
+      handleLearnPath(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+          message.destroy();
+          message.success("发布成功");
+          state.pub = false;
+          // getLearnPath();
+          reget();
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
+    };
+    //显示发布弹窗
+    const showPub = () => {
+      state.pub = true;
+      // state.releasePathId = routerId;
+      //获取学员总数
+      let obj = {
+        pageNo: 0,
+        pageSize: 0,
+        routerId: state.routerId,
+      };
+      api
+        .getStudent(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("res", res.data.data);
+            state.routeStudentsNum = res.data.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+        });
+
+      //获取学习路径详细信息
+      // api
+      //   .getRouterDetail(routerId)
+      //   .then((res) => {
+      //     console.log("学习路径详情", res);
+      //   })
+      //   .catch((err) => {
+      //     console.log("学习路径详情获取错误", err);
+      //   });
+    };
+    //显示撤回弹窗
+    const showBackModal = () => {
+      state.backModal = true;
+    };
+    //关闭撤回弹窗
+    const closeBackModal = () => {
+      state.backModal = false;
+    };
+    //确定撤回
+    const recallPath = () => {
+      let obj = {
+        routerId: state.routerId,
+        type: 0,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
+    };
+    //显示复制弹窗
+    const showCopy = () => {
+      state.dcopyModal = true;
+    };
+    //关闭复制弹窗
+    const closeCopy = () => {
+      state.dcopyModal = false;
+    };
+    //确认复制
+    const sureCopy = () => {
+      state.dcopyModal = false;
+    };
+    const showStop = () => {
+      state.stopModal = true;
+    };
+    //关闭结束窗口
+    const closeStopModal = () => {
+      state.stopModal = false;
+    };
+    //确认结束
+    const stopLearnPath = () => {
+      let obj = {
+        routerId: state.routerId,
+        type: -1,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("停用成功", res);
+          message.destroy();
+          message.success("停用成功");
+          state.stopModal = false;
+          reget();
+          // getLearnPath();
+        })
+        .catch((err) => {
+          console.log("停用失败", err);
+        });
+    };
+    const reget = () => {
+      GetRouterDetail(state.routerId).then((res) => {
+        state.styTitle = res.data.data.routerInfo.name;
+        state.cretime = toDate(
+          res.data.data.routerInfo.createTime / 1000,
+          "Y-M-D h:m"
+        );
+        state.picUrl = res.data.data.routerInfo.picUrl;
+        state.action = res.data.data.routerInfo.status;
+        state.act =
+          state.action == 0
+            ? "发布"
+            : state.action == 1
+            ? "撤回"
+            : state.action == -1
+            ? ""
+            : "-";
+      });
+    };
 
     return {
       ...toRefs(state),
@@ -1509,6 +1861,19 @@ export default {
       checkType,
       handleChange,
       delConfirm,
+      closePub,
+      releaseLearnPath,
+      showPub,
+      showBackModal,
+      closeBackModal,
+      recallPath,
+      showCopy,
+      closeCopy,
+      sureCopy,
+      closeStopModal,
+      stopLearnPath,
+      showStop,
+      reget,
     };
   },
 };
@@ -1520,6 +1885,142 @@ export default {
   display: block;
   clear: both;
 }
+.pub {
+  .ant-modal {
+    .ant-modal-body {
+      padding: 0;
+      .modalHeader {
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
+      }
+      .modalMain {
+        .projectname {
+          color: rgba(79, 81, 86, 1);
+          font-size: 14px;
+          line-height: 36px;
+          margin-left: 62px;
+          font-weight: 500;
+        }
+        .projecttime {
+          margin-left: 221px;
+          .timeti {
+            color: rgba(153, 155, 163, 1);
+            font-size: 14px;
+            line-height: 36px;
+          }
+          .timeme {
+            color: rgba(79, 81, 86, 1);
+            font-size: 14px;
+            line-height: 36px;
+          }
+        }
+        .projectbox {
+          margin-top: 26px;
+          display: flex;
+          justify-content: center;
+          .promessage {
+            width: 280px;
+            height: 110px;
+            background: linear-gradient(
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
+            );
+            border-radius: 10px;
+            margin-right: 7px;
+            .messageme {
+              color: rgba(255, 182, 78, 1);
+              font-size: 14px;
+              line-height: 36px;
+              margin-top: 17px;
+              margin-left: 30px;
+            }
+            .messagege {
+              color: rgba(153, 155, 163, 1);
+              font-size: 14px;
+              margin-left: 30px;
+            }
+          }
+          .stumessage {
+            width: 280px;
+            height: 110px;
+            background: linear-gradient(
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
+            );
+            border-radius: 10px;
+            .messageme1 {
+              color: rgba(78, 166, 255, 1);
+              font-size: 14px;
+              line-height: 36px;
+              margin-top: 17px;
+              margin-left: 30px;
+            }
+            .messagege1 {
+              color: rgba(153, 155, 163, 1);
+              font-size: 14px;
+              margin-left: 30px;
+            }
+          }
+        }
+        .send {
+          margin-top: 30px;
+          margin-left: 61px;
+          .sendtext {
+            margin-left: 11px;
+            color: rgba(109, 117, 132, 1);
+            font-size: 14px;
+          }
+        }
+        .ckb {
+          margin-top: 20px;
+          margin-left: 62px;
+          .sendpeo {
+            color: rgba(109, 117, 132, 1);
+            font-size: 14px;
+          }
+          .ant-checkbox-inner {
+            border-radius: 4px;
+          }
+        }
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
+}
 .CopyModal {
   .ant-modal {
     width: 424px !important;
@@ -1931,7 +2432,8 @@ export default {
         }
         .moreItems {
           width: 110px;
-          height: 80px;
+          // height: 80px;
+          padding-bottom: 12px;
           display: none;
           background: #ffffff;
           box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 26559cac..91c50720 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -14,20 +14,72 @@
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
         <div class="line"></div>
         <img class="img2" src="../../assets/images/leveladd/pub.png" />
-        <div class="pub">发布</div>
+        <!-- <div class="pub">发布</div> -->
+        <!-- 已发布的显示 -->
+        <div
+          class="pub"
+          style="width: 28px"
+          v-if="action == 1"
+          @click="showBackModal"
+        >
+          {{ act }}
+        </div>
+        <!-- 未发布/草稿的显示 -->
+        <div
+          class="pub"
+          style="width: 28px"
+          v-if="action == 0"
+          @click="showProjectPub"
+        >
+          {{ act }}
+        </div>
+        <!-- 已结束的显示 -->
+        <div class="pub" style="width: 28px" v-if="action == -1">
+          {{ act }}
+        </div>
         <div class="line"></div>
         <img
           style="margin-right: 15px"
           class="img2"
           src="../../assets/images/leveladd/more.png"
         />
-        <div class="more">
+        <!-- <div class="more">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
           <div class="moreItems">
             <div class="sammo">撤回</div>
             <div class="sammo">复制</div>
           </div>
+        </div> -->
+        <!-- 草稿/未发布的显示 -->
+        <div class="more" v-if="action == 0">
+          <span style="color: #7096e3; cursor: pointer">更多</span>
+          <div class="moreArrow"></div>
+          <div class="moreItems">
+            <!-- <div class="sammo">撤回</div> -->
+            <div class="sammo">复制</div>
+            <div class="sammo" @click="showStartModal">存为模板</div>
+          </div>
+        </div>
+        <!-- 已发布的显示 -->
+        <div class="more" v-if="action == 1">
+          <span style="color: #7096e3; cursor: pointer">更多</span>
+          <div class="moreArrow"></div>
+          <div class="moreItems">
+            <div class="sammo" @click="showStopModal">结束</div>
+            <div class="sammo">复制</div>
+            <div class="sammo" @click="showStartModal">存为模板</div>
+          </div>
+        </div>
+        <!-- 已结束的显示 -->
+        <div class="more" v-if="action == -1">
+          <span style="color: #7096e3; cursor: pointer">更多</span>
+          <div class="moreArrow"></div>
+          <div class="moreItems">
+            <!-- <div class="sammo">结束</div> -->
+            <div class="sammo">复制</div>
+            <div class="sammo" @click="showStartModal">存为模板</div>
+          </div>
         </div>
         <div class="line"></div>
         <router-link to="/projectmanage">
@@ -1484,6 +1536,178 @@
       type="课程二维码"
     />
     <!-- 二维码弹窗 -->
+
+    <!-- 发布弹窗 -->
+    <a-modal
+      v-model:visible="projectPub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="projectPub"
+      width="679px"
+      height="437px"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div class="headerLeft" style="margin-left: 32px">
+          <span style="width: 15px; height: 15px"
+            ><img src="../../assets/images/taskpage/pub.png"
+          /></span>
+          <span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
+          >
+        </div>
+        <div
+          style="cursor: pointer; margin-right: 32px"
+          @click="closeProjectPub"
+        >
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
+          />
+        </div>
+      </div>
+      <div class="modalMain">
+        <div class="projectname">{{ releaseProjectName }}</div>
+        <div class="projecttime" v-if="startTime">
+          <span class="timeti">项目时间：</span
+          ><span class="timeme">{{ startTime }}~{{endTime}}</span>
+        </div>
+        <div class="projectbox">
+          <div class="promessage">
+            <div class="messageme">项目信息</div>
+            <div class="messagege">当前项目共0个阶段，0个任务</div>
+          </div>
+          <div class="stumessage">
+            <div class="messageme1">学员信息</div>
+            <div class="messagege1">项目共{{ projectStudentsNum }}名学员</div>
+          </div>
+        </div>
+        <!-- <div class="send">
+          <a-switch v-model:checked="checked" size="small" />
+          <span class="sendtext">发送路径通知</span>
+        </div>
+        <div class="ckb">
+          <a-checkbox v-model:checked="checkedTeacher"
+            ><span class="sendpeo">发给老师</span></a-checkbox
+          >
+          <a-checkbox v-model:checked="checkStu"
+            ><span class="sendpeo">发给学员</span></a-checkbox
+          >
+        </div> -->
+        <div class="pubtn">
+          <a-button class="pubtn1" @click="closeProjectPub">取消</a-button>
+          <a-button class="pubtn2" @click="releaseProject">发布</a-button>
+        </div>
+      </div>
+    </a-modal>
+
+    <!-- 撤回弹窗 -->
+    <a-modal
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      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="closeBackModal"></div>
+          </div>
+          <div class="body">
+            <span>是否撤回项目</span>
+            <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeBackModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="recallProject">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+
+    <!-- 结束项目弹窗 -->
+    <a-modal
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      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="closeStopModal"></div>
+          </div>
+          <div class="body">
+            <span>是否结束项目</span>
+            <div class="back">
+              （项目结束后学员将无法继续学习，此操作不可逆）
+            </div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeStopModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="finishProject">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+
+    <!-- 存为模版弹窗 -->
+    <a-modal
+      v-model:visible="startModal"
+      :footer="null"
+      :closable="closeStart"
+      wrapClassName="CopyModal"
+      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="closeStartModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要存为模版吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeStartModal">
+              <div class="btnText">取消</div>
+            </div>
+            <div class="del_btn btn2" @click="templateProject">
+              <div class="btnText">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -1509,6 +1733,7 @@ import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
 import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
+import * as apiproj from "../../api/index";
 import {
   getProjStu,
   deleteStu,
@@ -1698,6 +1923,19 @@ export default {
       chooseGroupId: null,
       morFaceT: false, //批量面授报名按钮
       faceArr: [], //任务大纲列表所有name
+      action: null,
+      act: null,
+      projectPub: false, //发布弹窗
+      projectStudentsNum: 0, //发布弹窗-学员人数
+      releaseProjectId: null, //发布的项目id
+      releaseProjectName: null, //发布的项目名称
+      releaseProjectTime: null, //发布的项目时间
+      backModal: false, //撤回弹窗
+      closeBack: false,
+      stopModal: false,
+      closeStop: false,
+      startModal: false,
+      closeStart: false,
       //进度排行表
       jindutabledata: [
         {
@@ -3159,12 +3397,160 @@ export default {
         }
       }
     };
+    const reget = () => {
+      getTask({
+        projectId: state.projectId,
+      }).then((res) => {
+        state.action = res.data.data.projectInfo.status;
+        state.act =
+          state.action == 0
+            ? "发布"
+            : state.action == 1
+            ? "撤回"
+            : state.action == -1
+            ? ""
+            : "-";
+      });
+    };
+    //打开发布弹窗
+    const showProjectPub = () => {
+      state.projectPub = true;
+      state.releaseProjectId = state.projectId;
+      state.releaseProjectName = state.name;
+      // state.releaseProjectTime = state.startTime;
+      // console.log("object", object);
+      //获取学员总数
+      let obj = {
+        pageNo: 0,
+        pageSize: 0,
+        projectId: state.projectId,
+      };
+      apiproj
+        .projectStudent(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("res", res.data);
+            state.projectStudentsNum = res.data.data.total
+              ? res.data.data.total
+              : 0;
+          }
+        })
+        .catch((err) => {
+          console.log("获取学员人数失败", err);
+        });
+      //获取阶段及任务总数
+    };
+    //关闭发布弹窗
+    const closeProjectPub = () => {
+      state.projectPub = false;
+    };
+    //确认发布项目
+    const releaseProject = () => {
+      console.log("点击发布");
+      let obj = {
+        projectId: state.releaseProjectId,
+      };
+      apiproj
+        .releaseProject(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+          message.destroy();
+          message.success("发布成功");
+          state.projectPub = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
+    };
+
+    //打开撤回弹窗
+    const showBackModal = () => {
+      state.backModal = true;
+    };
+    //关闭撤回弹窗
+    const closeBackModal = () => {
+      state.backModal = false;
+    };
+    const recallProject = () => {
+      let obj = {
+        projectId: state.projectId,
+        type: 0,
+      };
+      apiproj
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
+    };
+    //关闭结束弹窗
+    const closeStopModal = () => {
+      state.stopModal = false;
+    };
+    //确认结束
+    const finishProject = () => {
+      let obj = {
+        projectId: state.projectId,
+        type: -1,
+      };
+      apiproj
+        .handleProject(obj)
+        .then((res) => {
+          console.log("结束成功", res);
+          message.destroy();
+          message.success("已结束");
+          state.stopModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("结束失败", err);
+        });
+    };
+    //打开结束弹窗
+    const showStopModal = () => {
+      state.stopModal = true;
+    };
+    //打开存为模版弹窗
+    const showStartModal = () => {
+      state.startModal = true;
+    };
+    //关闭存为模版弹窗
+    const closeStartModal = () => {
+      state.startModal = false;
+    };
+    //确认存为模版
+    const templateProject = () => {
+      let obj = {
+        projectId: state.projectId,
+        type: 1,
+      };
+      apiproj
+        .handleProject(obj)
+        .then((res) => {
+          console.log("模版保存成功", res);
+          message.destroy();
+          message.success("模版保存成功");
+          state.startModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("模版保存失败", err);
+        });
+    };
     onMounted(() => {
       getStu();
       getTaskList();
       getTaskInfo();
       getGroup();
       getOverview();
+      reget();
     });
     return {
       ...toRefs(state),
@@ -3244,6 +3630,19 @@ export default {
       changePaginationStu,
       handleChange,
       toEdit,
+      reget,
+      showProjectPub,
+      closeProjectPub,
+      releaseProject,
+      showBackModal,
+      closeBackModal,
+      recallProject,
+      closeStopModal,
+      finishProject,
+      showStopModal,
+      showStartModal,
+      closeStartModal,
+      templateProject,
     };
   },
 };
@@ -3553,6 +3952,133 @@ export default {
   }
 }
 
+.CopyModal {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+
+        .delete {
+          z-index: 999;
+          width: 424px;
+          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/coursewareManage/QR.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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 .canclestu1 {
   .ant-modal {
     width: 424px !important;
@@ -3784,6 +4310,144 @@ export default {
   }
 }
 
+.projectPub {
+  .ant-modal {
+    .ant-modal-body {
+      padding: 0;
+      .modalHeader {
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
+      }
+      .modalMain {
+        .projectname {
+          color: rgba(79, 81, 86, 1);
+          font-size: 14px;
+          line-height: 36px;
+          // margin-left: 62px;
+          font-weight: 500;
+          text-align: center;
+        }
+        .projecttime {
+          margin-left: 221px;
+          .timeti {
+            color: rgba(153, 155, 163, 1);
+            font-size: 14px;
+            line-height: 36px;
+          }
+          .timeme {
+            color: rgba(79, 81, 86, 1);
+            font-size: 14px;
+            line-height: 36px;
+          }
+        }
+        .projectbox {
+          margin-top: 26px;
+          display: flex;
+          justify-content: center;
+          .promessage {
+            width: 280px;
+            height: 110px;
+            background: linear-gradient(
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
+            );
+            border-radius: 10px;
+            margin-right: 7px;
+            .messageme {
+              color: rgba(255, 182, 78, 1);
+              font-size: 14px;
+              line-height: 36px;
+              margin-top: 17px;
+              margin-left: 30px;
+            }
+            .messagege {
+              color: rgba(153, 155, 163, 1);
+              font-size: 14px;
+              margin-left: 30px;
+            }
+          }
+          .stumessage {
+            width: 280px;
+            height: 110px;
+            background: linear-gradient(
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
+            );
+            border-radius: 10px;
+            .messageme1 {
+              color: rgba(78, 166, 255, 1);
+              font-size: 14px;
+              line-height: 36px;
+              margin-top: 17px;
+              margin-left: 30px;
+            }
+            .messagege1 {
+              color: rgba(153, 155, 163, 1);
+              font-size: 14px;
+              margin-left: 30px;
+            }
+          }
+        }
+        .send {
+          margin-top: 30px;
+          margin-left: 61px;
+          .sendtext {
+            margin-left: 11px;
+            color: rgba(109, 117, 132, 1);
+            font-size: 14px;
+          }
+        }
+        .ckb {
+          margin-top: 20px;
+          margin-left: 62px;
+          .sendpeo {
+            color: rgba(109, 117, 132, 1);
+            font-size: 14px;
+          }
+          .ant-checkbox-inner {
+            border-radius: 4px;
+          }
+        }
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
+}
+
 .facemanageModal {
   .ant-modal {
     width: 532px !important;
@@ -4016,7 +4680,8 @@ export default {
 
         .moreItems {
           width: 110px;
-          height: 80px;
+          // height: 80px;
+          padding-bottom: 12px;
           display: none;
           background: #ffffff;
           box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);

From 6356ac63f1d3fe166e864d23428d83b21d101ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Thu, 17 Nov 2022 10:00:53 +0800
Subject: [PATCH 58/90] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=20=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE=E5=8F=91=E5=B8=83=E6=92=A4=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=A4=8D=E5=88=B6=E5=AD=98=E4=B8=BA=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue  | 12 ++++++++----
 src/views/projectcenter/TaskPage.vue | 14 +++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index ef07b558..2b98d2ba 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -11,8 +11,12 @@
       </div>
       <div class="right">
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
-        <div class="line"></div>
-        <img class="img2" src="../../assets/images/leveladd/pub.png" />
+        <div v-if="action == 1 || action == 0" class="line"></div>
+        <img
+          v-if="action == 1 || action == 0"
+          class="img2"
+          src="../../assets/images/leveladd/pub.png"
+        />
         <!-- 已发布的显示 -->
         <div
           class="pub"
@@ -32,9 +36,9 @@
           {{ act }}
         </div>
         <!-- 已结束的显示 -->
-        <div class="pub" style="width: 28px" v-if="action == -1">
+        <!-- <div class="pub" style="width: 28px" v-if="action == -1">
           {{ act }}
-        </div>
+        </div> -->
         <div class="line"></div>
         <img
           style="margin-right: 15px"
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 91c50720..d6ea4cb4 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -12,8 +12,12 @@
       </div>
       <div class="right">
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
-        <div class="line"></div>
-        <img class="img2" src="../../assets/images/leveladd/pub.png" />
+        <div class="line" v-if="action == 1 || action == 0"></div>
+        <img
+          v-if="action == 1 || action == 0"
+          class="img2"
+          src="../../assets/images/leveladd/pub.png"
+        />
         <!-- <div class="pub">发布</div> -->
         <!-- 已发布的显示 -->
         <div
@@ -34,9 +38,9 @@
           {{ act }}
         </div>
         <!-- 已结束的显示 -->
-        <div class="pub" style="width: 28px" v-if="action == -1">
+        <!-- <div class="pub" style="width: 28px" v-if="action == -1">
           {{ act }}
-        </div>
+        </div> -->
         <div class="line"></div>
         <img
           style="margin-right: 15px"
@@ -1581,7 +1585,7 @@
         <div class="projectname">{{ releaseProjectName }}</div>
         <div class="projecttime" v-if="startTime">
           <span class="timeti">项目时间：</span
-          ><span class="timeme">{{ startTime }}~{{endTime}}</span>
+          ><span class="timeme">{{ startTime }}~{{ endTime }}</span>
         </div>
         <div class="projectbox">
           <div class="promessage">

From b8b0c7fd3cac5cf3ac38f78b3758f3c0a1ff648e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Thu, 17 Nov 2022 11:30:02 +0800
Subject: [PATCH 59/90] =?UTF-8?q?fix=EF=BC=9A=E5=AD=A6=E5=91=98=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E6=A8=A1=E6=9D=BF=E5=92=8C=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=C2=B7=E9=87=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=80=83=E8=AF=95=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue          |  85 +++++++-
 src/views/learningpath/LevelAdd.vue         | 228 +++++++++++---------
 src/views/projectcenter/TemplateLibrary.vue |  34 ++-
 3 files changed, 232 insertions(+), 115 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 2f7d1ff7..0432d2e2 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -16,11 +16,11 @@
         />
       </div>
       <div style="display: flex; flex-direction: row">
-        <a-button style="width:100px;"
+        <button style="width:100px;"
         @click="changeOuter(1)"
-         :class="[isOuter == 1? 'outer' : '' ]">系统考试</a-button>
-      <a-button style="width:100px;" @click="changeOuter(2)"
-       :class="[isOuter == 2? 'outer' : '' ]" >外部考试</a-button>
+         :class="[isOuter == 1? 'outer' : 'notOuter' ]">系统考试</button>
+      <button style="width:100px;" @click="changeOuter(2)"
+       :class="[isOuter == 2? 'outer' : 'notOuter' ]" >外部考试</button>
       </div>
       <a-form
             ref="formRef"
@@ -59,16 +59,34 @@
           </div>
           <div class="main_item">
             <div class="btnbox">
-              <a-form-item has-feedback label="选择考试" name="choosedTest">
-              <a-select
+              <a-form-item has-feedback label="选择试卷" name="choosedTest">
+              <!-- <a-select
                 dropdownClassName="dropdown-style"
-                style="width: 424px;margin-left: 35px;"
                 placeholder="请输入考试名称"
                 :options="options1"
                 v-model:value="formState.choosedTest"
                 allowClear
                 showSearch
-              />
+              /> -->
+              <a-dropdown >
+                <a-button   type="primary" style="width: 100px;margin-left: 35px;" class="outer" @click.prevent>
+                  选择试卷
+                  <DownOutlined />
+                </a-button>
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item v-for="item in formState.choosedTest" :key="item.key">
+                      <a @click="chooseTest(item.key-1)">{{item.value}}</a>
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+              <span style="margin-left: 10px">
+                <a-tag class="tag-style" 
+                v-for="item in choosedTestList" :closable="true"
+                @close="closeTag(item.key)"
+                 :key="item.key">{{item.value}}</a-tag>
+              </span>
             </a-form-item>
  
             </div>
@@ -274,10 +292,29 @@ export default {
       showAnalysis:2,
       showAnswers:2,
       choosedTime:'',
+      choosedTest:[
+        {
+          key:1,
+          value:'提高核心竞争力'
+        },
+        {
+          key:2,
+          value:'增强创新意识感'
+        },
+        {
+          key:3,
+          value:'巩固基础求发展'
+        },
+      ],
+      
     });
     const state = reactive({
       addLoading: false,
       isOuter:1, // 是否为外部考试
+      choosedTestList:[{
+        value:'提高核心竞争力',
+        key:1,
+      }],
     })
     const formRef = ref();
     let checkExaminationName = async (_rule, value) => {
@@ -555,6 +592,16 @@ export default {
       console.log(value)
       state.isOuter = value
     }
+    const chooseTest = (index) => {
+      for(let i in state.choosedTestList ) {
+        if(state.choosedTestList[i].key == formState.choosedTest[index].key) return;
+      }
+      state.choosedTestList.push(formState.choosedTest[index])
+    }
+    const closeTag = (removedTag) => {
+      const tags = state.choosedTestList.filter(item => item.key != removedTag);
+      state.choosedTestList = tags;
+    }
     return {
       formState,
       afterVisibleChange,
@@ -574,6 +621,8 @@ export default {
       updateTest,
       queryTest,
       changeOuter,
+      chooseTest,
+      closeTag,
       ...toRefs(state)
     };
   },
@@ -583,6 +632,26 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+.outer {
+  background-color: #4ea6ff;
+  color: #fff;
+  border-radius: 5px;
+  border:1px solid #a09292;
+  height: 36px;
+  margin-right: 10px;
+}
+.notOuter {
+  color: #000;
+  border-radius: 5px;
+  border:1px solid #a09292;
+  background:#fff;
+  margin-right: 10px;
+  padding:3px;
+}
+.tag-style {
+  color:rgb(113, 113, 237);
+  background-color:#d7d1f7;
+}
 .addtestDrawer {
   .drawerMain {
     .header {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 391164a5..b363e8c2 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -560,14 +560,14 @@
                   style="width: 270px; height: 40px; border-radius: 8px"
                   placeholder="关卡名称"
                 />
-                <div class="btns">
+                <div class="btns" @click="searchLevel" >
                   <div class="btn btn1">
                     <div class="search"></div>
-                    <div class="btnText">搜索</div>
+                    <a-button class="btnText" style="border:none;background:none;transform: translateY(-20%);"  >搜索</a-button>
                   </div>
-                  <div class="btn btn2">
+                  <div class="btn btn2" @click="resetLevel">
                     <div class="search"></div>
-                    <div class="btnText">重置</div>
+                    <a-button style="border:none;background:none; transform: translateY(-20%);width:100%;" class="btnText" >重置</a-button>
                   </div>
                 </div>
               </div>
@@ -821,6 +821,13 @@
           </div>
         </div></a-modal
       >
+      
+      <!-- 查看学员 传入查看学员的id-->
+    <see-stu
+      v-model:Seevisible="Seevisible"
+      v-model:checkStuId="checkStuId"
+      v-model:projectId="projectId"
+    />
 
       <!-- 批量删除学员弹窗 -->
       <a-modal
@@ -1146,14 +1153,15 @@ import TimeManage from "../../components/drawers/TimeManage";
 import TestManage from "../../components/drawers/TestManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
+import SeeStu from "../../components/drawers/SeeStu";
 // import { useRoute } from "vue-router";
 // import { useStore } from "vuex";
 import { storage } from "../../api/storage";
 import { getRouterOverview } from "@/api/indexLearningPath";
+import { handleLearnPath } from "../../api/index1";
 import { GetRouterDetail } from "@/api/indexTask";
 import * as api from "../../api/index1";
 import { toDate } from "../../api/method";
-import { handleLearnPath } from "../../api/index1";
 
 export default {
   name: "LevelAdd",
@@ -1167,6 +1175,7 @@ export default {
     TestManage,
     FaceManage,
     WorkManage,
+    SeeStu
   },
   methods: {},
   setup() {
@@ -1178,6 +1187,16 @@ export default {
         : null, //学习路径页面传的学习路径id
       gatename: null, //关卡名称
       gatenamee: null, //学员管理关卡名称
+      action: null,
+      act: null,
+      pub: false, //发布弹窗
+      backModal: false, //撤回弹窗
+      dcopyModal: false, //复制弹窗
+      closeBack: false,
+      routeStudentsNum: null,
+      dcloseCopy: false,
+      dicloseCopy: false,
+      stopModal: false, //结束弹窗
       deleteAll: false, //批量删除学员弹窗
       Stuvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
@@ -1187,14 +1206,14 @@ export default {
       twobtn: true,
       number: true,
       twobtnn: false,
+      Seevisible:false,
+      checkStuId:null,
       inputbox: false,
       Wvisible: false, //作业管理
       studentId: null,
       styTitle: null,
       cretime: null,
       picUrl: null,
-      action: null,
-      act: null,
       // 共享文档列表
       docList: [
         {
@@ -1260,14 +1279,6 @@ export default {
       visible: false, //时间管理
       TMvisible: false, //考试管理
       FaceVisivle: false, //面授管理
-      pub: false, //发布弹窗
-      backModal: false, //撤回弹窗
-      dcopyModal: false, //复制弹窗
-      closeBack: false,
-      routeStudentsNum: null,
-      dcloseCopy: false,
-      dicloseCopy: false,
-      stopModal: false, //结束弹窗
       //关卡的数据
       level: [
         // {
@@ -1412,6 +1423,7 @@ export default {
                   <span
                     onClick={() => {
                       showCheckStu(text.record.studentId);
+                      state.Seevisible = true;
                     }}
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                   >
@@ -1610,89 +1622,6 @@ export default {
       getOverview();
       reget();
     });
-
-    // 获取项目概览
-    const getOverview = () => {
-      getRouterOverview(state.routerId)
-        .then((res) => {
-          Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
-            levelList.routerInfoOverview[item] =
-              res.data.data.routerInfoOverview[item] || 0;
-          });
-          Object.keys(res.data.data.chapterOverviewList).forEach((item) => {
-            levelList.chapterOverviewList[item] =
-              res.data.data.chapterOverviewList[item] || 0;
-          });
-          // res.data.data.routerInfoOverview.forEach((r) => {
-          //   console.log(r)
-          // })
-          state.addLoading = false;
-          console.log("项目概览--" + res);
-        })
-        .catch((err) => {
-          state.addLoading = false;
-          message.error("概览获取失败");
-          console.log("获取失败" + err);
-        });
-    };
-    // 获取路径列表
-    const myGetRouterDetail = () => {
-      GetRouterDetail(state.routerId)
-        .then((res) => {
-          let data = res.data.data.chapterList;
-
-          state.taskSyllabus = data;
-          // for(let i in data) {
-          //   state.taskSyllabus[i].name = data[i].name
-          //   if(data[i].taskList.length > 0) {
-          //     for(let j in data[i].taskList) {
-          //     Object.keys(data[i].taskList[j]).forEach(item => {
-          //     state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
-          // })
-          //   }
-          //   }
-
-          // }
-        })
-        .catch((err) => {
-          console.log(err);
-          message.error("获取路径列表失败" + err);
-        });
-    };
-
-    const handleChange = (info) => {
-      if (info.file.status !== "uploading") {
-        console.log(info.file, info.fileList);
-      }
-
-      if (info.file.status === "done") {
-        message.success(`${info.file.name} 文件上传成功`);
-      } else if (info.file.status === "error") {
-        message.error(`${info.file.name} 文件上传失败.`);
-      }
-    };
-
-    const delConfirm = (id) => {
-      Modal.confirm({
-        title: "是否确认删除",
-        icon: createVNode(ExclamationCircleOutlined),
-        content: "",
-        okText: "确认",
-        cancelText: "取消",
-        onOk() {
-          api
-            .delStudent({ routerId: 100, studentIds: [id] })
-            .then((res) => {
-              message.success("删除成功");
-              console.log(res);
-            })
-            .catch((err) => {
-              message.error("删除失败" + err);
-              console.log(err);
-            });
-        },
-      });
-    };
     const closePub = () => {
       state.pub = false;
     };
@@ -1850,7 +1779,96 @@ export default {
             : "-";
       });
     };
+    // 获取项目概览
+    const getOverview = () => {
+      getRouterOverview(state.routerId)
+        .then((res) => {
+          Object.keys(res.data.data.routerInfoOverview).forEach((item) => {
+            levelList.routerInfoOverview[item] =
+              res.data.data.routerInfoOverview[item] || 0;
+          });
+          Object.keys(res.data.data.chapterOverviewList).forEach((item) => {
+            levelList.chapterOverviewList[item] =
+              res.data.data.chapterOverviewList[item] || 0;
+          });
+          // res.data.data.routerInfoOverview.forEach((r) => {
+          //   console.log(r)
+          // })
+          state.addLoading = false;
+          console.log("项目概览--" + res);
+        })
+        .catch((err) => {
+          state.addLoading = false;
+          message.error("概览获取失败");
+          console.log("获取失败" + err);
+        });
+    };
+    // 获取路径列表
+    const myGetRouterDetail = () => {
+      GetRouterDetail(state.routerId)
+        .then((res) => {
+          let data = res.data.data.chapterList;
 
+          state.taskSyllabus = data;
+          // for(let i in data) {
+          //   state.taskSyllabus[i].name = data[i].name
+          //   if(data[i].taskList.length > 0) {
+          //     for(let j in data[i].taskList) {
+          //     Object.keys(data[i].taskList[j]).forEach(item => {
+          //     state.taskSyllabus[i].taskList[j][item] = data[i].taskList[j][item] || 0
+          // })
+          //   }
+          //   }
+
+          // }
+        })
+        .catch((err) => {
+          console.log(err);
+          message.error("获取路径列表失败" + err);
+        });
+    };
+
+    const handleChange = (info) => {
+      if (info.file.status !== "uploading") {
+        console.log(info.file, info.fileList);
+      }
+
+      if (info.file.status === "done") {
+        message.success(`${info.file.name} 文件上传成功`);
+      } else if (info.file.status === "error") {
+        message.error(`${info.file.name} 文件上传失败.`);
+      }
+    };
+
+    const delConfirm = (id) => {
+      Modal.confirm({
+        title: "是否确认删除",
+        icon: createVNode(ExclamationCircleOutlined),
+        content: "",
+        okText: "确认",
+        cancelText: "取消",
+        onOk() {
+          api
+            .delStudent({ routerId: 100, studentIds: [id] })
+            .then((res) => {
+              message.success("删除成功");
+              console.log(res);
+            })
+            .catch((err) => {
+              message.error("删除失败" + err);
+              console.log(err);
+            });
+        },
+      });
+    };
+    const searchLevel = () => {
+      const result = state.tableData.filter(item => item.cur == state.gatenamee)
+      state.tableData = result;
+    };
+    const resetLevel = () => {
+      state.gatenamee = '';
+      getStudent();
+    };
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -1881,6 +1899,8 @@ export default {
       checkType,
       handleChange,
       delConfirm,
+      searchLevel,
+      resetLevel,
       closePub,
       releaseLearnPath,
       showPub,
@@ -1899,12 +1919,6 @@ export default {
 };
 </script>
 <style lang="scss">
-.clearfix:before,
-.clearfix:after {
-  content: " ";
-  display: block;
-  clear: both;
-}
 .pub {
   .ant-modal {
     .ant-modal-body {
@@ -2041,6 +2055,12 @@ export default {
     }
   }
 }
+.clearfix:before,
+.clearfix:after {
+  content: " ";
+  display: block;
+  clear: both;
+}
 .CopyModal {
   .ant-modal {
     width: 424px !important;
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index 972071c7..f450dadc 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -34,11 +34,11 @@
           </div>
         </div>
         <div class="tmplh_btn">
-          <div class="btn btn1">
+          <div class="btn btn1" @click="searchLevel">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn2" @click="resetLevel">
             <div class="search"></div>
             <div class="btnText btnText2">重置</div>
           </div>
@@ -106,6 +106,7 @@ export default defineComponent({
   name: "TemplateLibrary",
   setup() {
     const state = reactive({
+      value1:null,
       tableData1: [
         {
           key: "1",
@@ -232,12 +233,39 @@ export default defineComponent({
         message.error(`模板操作失败`+error)
       })
     }
-    
+    const searchLevel = () => {
+      const result = state.tableData1.filter(item => item.name == state.value1)
+      state.tableData1 = result;
+    };
+    const resetLevel = () => {
+      state.value1 = '';
+      // getLibraryList();
+      state.tableData1 = [
+        {
+          key: "1",
+          name: "测试模板1",
+          status: "已发布",
+          creator: "李部长",
+          stutime: "2022-10-31  23:12:00",
+          operation: "operation",
+        },
+        {
+          key: "2",
+          name: "测试模板2",
+          status: "未发布",
+          creator: "李部长",
+          stutime: "2022-10-31  23:12:00",
+          operation: "operation",
+        }
+      ]
+    };
 
     return {
       ...toRefs(state),
       columns1,
       templateHadler,
+      searchLevel,
+      resetLevel,
     };
   },
 });

From 54b6e4d6ec651d17aea65d0ad0b3c70865937c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Thu, 17 Nov 2022 16:16:14 +0800
Subject: [PATCH 60/90] =?UTF-8?q?feat:=E5=AD=A6=E5=91=98=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=20=E6=90=9C=E7=B4=A2=E9=87=8D=E7=BD=AE=E6=9F=A5=E7=9C=8B=20?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=98=B6=E6=AE=B5=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexExam.js                      |  17 +-
 src/api/indexLiveBroadcast.js             |  18 +-
 src/api/indexProjStu.js                   |   5 +-
 src/api/indexTaskadd.js                   |   6 +-
 src/api/indexWork.js                      |  14 +-
 src/components/drawers/AddDiscuss.vue     |   1 +
 src/components/drawers/ProjectScore.vue   | 148 ++++--
 src/components/drawers/StuScoreDetail.vue | 542 ++++++++++------------
 src/views/learningpath/LevelAddDetail.vue | 111 +++--
 src/views/projectcenter/TaskAdd.vue       |  41 +-
 10 files changed, 473 insertions(+), 430 deletions(-)

diff --git a/src/api/indexExam.js b/src/api/indexExam.js
index 727dd42c..dbf1e0ab 100644
--- a/src/api/indexExam.js
+++ b/src/api/indexExam.js
@@ -1,17 +1,14 @@
 import http from "./config";
 // 创建考试信息接口
-export const createExamination = (obj) => http.post('/examination/createExamination',obj,{
-	headers: {
-		'token': '123'
-	}
-});
+export const createExamination = (obj) => http.post('/examination/createExamination', obj);
 // 根据Id删除考试信息
-export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',obj);
+export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById', obj);
 // 根据ID获取考试信息详情
-export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj,{headers: {
-	'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-}
+export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById', obj, {
+  headers: {
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+  }
 });
 // 创建考试信息接口
-export const updateExamination = (obj) => http.post('/examination/updateExamination',obj);
+export const updateExamination = (obj) => http.post('/examination/updateExamination', obj);
 
diff --git a/src/api/indexLiveBroadcast.js b/src/api/indexLiveBroadcast.js
index f855dcc0..0418e99c 100644
--- a/src/api/indexLiveBroadcast.js
+++ b/src/api/indexLiveBroadcast.js
@@ -4,25 +4,13 @@ import http from "./config";
 export const getLiveBroadcastInfor = (obj) => http.get('/liveBroadcast', { params: obj })
 
 //创建直播接口
-export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj, {
-  headers: {
-    'token': '123'
-  }
-})
+export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj)
 
 //直播信息删除接口
-export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj, {
-  headers: {
-    'token': '123'
-  }
-})
+export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj)
 
 //直播信息修改接口
-export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj, {
-  headers: {
-    'token': '123'
-  }
-})
+export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj)
 
 //获取全部评估信息接口
 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj)
\ No newline at end of file
diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index b8dfc793..7d41cb19 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -25,4 +25,7 @@ export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
 export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
 
 //设置项目积分规则
-export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
\ No newline at end of file
+export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
+
+//获取学员积分明细列表
+export const studentScoreList = (obj) => http.post('/admin/project/studentScoreList', obj)
\ No newline at end of file
diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index 6b01be18..b88140e7 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -1,10 +1,6 @@
 import http from "./config";
 //获取任务列表
-export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, {
-  headers: {
-    'token': '123'
-  }
-})
+export const getTask = (obj) => http.get('/admin/project/detail', { params: obj })
 
 //项目里的新建或编辑阶段任务
 export const addTask = (obj) => http.post('/admin/project/editTask', obj)
diff --git a/src/api/indexWork.js b/src/api/indexWork.js
index af189946..827bec68 100644
--- a/src/api/indexWork.js
+++ b/src/api/indexWork.js
@@ -1,18 +1,14 @@
 import http from "./config";
 // 创建作业信息接口
 export const createWorkTask = (obj) =>
-  http.post("/work/createWorkTask", obj, {
-    headers: {
-      token: "123",
-    },
-  });
+  http.post("/work/createWorkTask", obj);
 // 删除作业信息接口
 export const deleteWorkTask = (obj) => http.post("/work/deleteWorkTask", obj);
 // 根据ID获取作业信息详情
-export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj,{
-	headers: {
-		'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-	}
+export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById', obj, {
+  headers: {
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+  }
 });
 // 修改作业信息接口
 export const updateWorkTaskUsing = (obj) =>
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 70aa3844..82c753f3 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -175,6 +175,7 @@ export default {
       state.textV1 = "";
       message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
       localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const queryDiscuss = () => {
       if (props.edit) {
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 67e313a3..b818bc91 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -9,16 +9,16 @@
             <div class="groupname" style="width: 42px">姓名：</div>
             <a-input
               class="ant-input"
-              v-model:value="value"
+              v-model:value="searchNameValue"
               placeholder="请输入姓名"
             />
           </div>
           <div class="groupright">
-            <div class="btn1">
+            <div class="btn1" @click="searchStu">
               <img src="../../assets/images/courseManage/search0.png" />
               <span class="btn1text">搜索</span>
             </div>
-            <div class="btn2">
+            <div class="btn2" @click="resetStud">
               <img src="../../assets/images/courseManage/reset1.png" />
               <span class="btn2text">重置</span>
             </div>
@@ -36,6 +36,7 @@
           />
           <div class="pa">
             <a-pagination
+              v-if="tableDataTotal > 10"
               showSizeChanger="true"
               showQuickJumper="true"
               hideOnSinglePage="true"
@@ -43,6 +44,7 @@
               :current="currentPage"
               :total="tableDataTotal"
               class="pagination"
+              @change="changePagination"
             />
           </div>
         </div>
@@ -277,16 +279,21 @@
       >
     </a-tabs>
   </div>
-  <stu-score-detail v-model:Svisible="Svisible" />
+  <stu-score-detail
+    v-model:Svisible="Svisible"
+    v-model:studentId="checkStuId"
+    v-model:projectId="proId"
+  />
 </template>
 
 <script>
 import StuScoreDetail from "../../components/drawers/StuScoreDetail";
-import { reactive, toRefs, computed } from "vue";
+import { reactive, toRefs, computed, onMounted } from "vue";
 import * as api from "../../api/index1";
 // import { message } from "ant-design-vue";
 // import { scoreRule } from "../../api/indexTaskadd"; //获取项目积分规则
 import { setScoreRule } from "../../api/indexTaskadd"; //设置项目积分规则
+import { getProjStu } from "../../api/indexProjStu";
 export default {
   name: "ProjectScore",
   components: {
@@ -301,42 +308,15 @@ export default {
   setup(props) {
     const state = reactive({
       tabledataStu: [
-        {
-          key: 1,
-          name: "小李",
-          bum: "产研部",
-          gangw: "产品经理",
-          group: "好好学习",
-          diploma: "0",
-          operation: "查看",
-        },
-        {
-          key: 2,
-          name: "小刘",
-          bum: "产研部",
-          gangw: "产品经理",
-          group: "天天向上",
-          diploma: "0",
-          operation: "查看",
-        },
-        {
-          key: 3,
-          name: "小王",
-          bum: "产研部",
-          gangw: "后端",
-          group: "好好学习",
-          diploma: "0",
-          operation: "查看",
-        },
-        {
-          key: 4,
-          name: "小赵",
-          bum: "产研部",
-          gangw: "前端",
-          group: "天天向上",
-          diploma: "0",
-          operation: "查看",
-        },
+        // {
+        //   key: 1,
+        //   name: "小李",
+        //   bum: "产研部",
+        //   gangw: "产品经理",
+        //   group: "好好学习",
+        //   diploma: "0",
+        //   operation: "查看",
+        // },
       ],
 
       tablecolumnStu: [
@@ -387,6 +367,20 @@ export default {
           width: 60,
           align: "center",
           className: "operation",
+          customRender: (value) => {
+            return (
+              <div
+                style="color:#387df7;cursor:pointer"
+                onClick={() => {
+                  state.Svisible = true;
+                  console.log(value.record.key);
+                  state.checkStuId = value.record.key;
+                }}
+              >
+                查看
+              </div>
+            );
+          },
         },
       ],
       datascore: [
@@ -450,7 +444,6 @@ export default {
       activeKeyScore: "2",
       stuName: "请输入姓名",
       todayvalue: "1",
-      tableDataTotal: 30,
       stuValue: false,
       Svisible: false,
       score1: null,
@@ -468,6 +461,12 @@ export default {
       seven2: null,
       edit: true,
       searchRankName: null, //榜单搜索名称
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: null,
+      searchNameValue: null, //学员获取的姓名
+      checkStuId: null,
+      proId: null,
     });
     const getTableData = () => {
       let datas = state.tabledataStu;
@@ -599,6 +598,66 @@ export default {
 
       state.edit = true;
     };
+    const getStu = (obj) => {
+      state.proId = props.projectId;
+      let objn = obj || {
+        deptIds: [],
+        groupId: "",
+        groupName: "",
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectId: props.projectId,
+        topFlag: "",
+      };
+      getProjStu(objn).then((res) => {
+        console.log("dedaole", res.data.data.rows);
+        let result = res.data.data.rows;
+        state.tableDataTotal = res.data.data.total;
+        setStuData(result);
+      });
+    };
+    const setStuData = (tabledata) => {
+      let data = tabledata;
+      let array = [];
+      data.map((item) => {
+        let obj = {
+          key: item.studentId,
+          name: item.name,
+          bum: item.userInfoBo.deptName,
+          gangw: item.userInfoBo.jobName,
+          group: item.groupName,
+          diploma: "0",
+          // operation: "查看",
+        };
+        array.push(obj);
+      });
+      state.tabledataStu = array;
+    };
+    const changePagination = (current) => {
+      state.currentPage = current;
+      getStu();
+    };
+    const searchStu = () => {
+      let obj = {
+        deptIds: [],
+        groupId: "",
+        groupName: "",
+        name: state.searchNameValue,
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectId: props.projectId,
+        topFlag: "",
+      };
+      getStu(obj);
+    };
+    const resetStud = () => {
+      state.searchNameValue = null;
+      getStu();
+    };
+    onMounted(() => {
+      getStu();
+    });
     return {
       ...toRefs(state),
       typeChange,
@@ -609,6 +668,11 @@ export default {
       scoreRank,
       editRule,
       scoresum,
+      getStu,
+      setStuData,
+      changePagination,
+      searchStu,
+      resetStud,
     };
   },
   // computed: {
diff --git a/src/components/drawers/StuScoreDetail.vue b/src/components/drawers/StuScoreDetail.vue
index caf2d364..b137242c 100644
--- a/src/components/drawers/StuScoreDetail.vue
+++ b/src/components/drawers/StuScoreDetail.vue
@@ -1,35 +1,34 @@
 <template>
-    <a-drawer
-      :visible="Svisible"
-      class="drawerStyle StuScore"
-      placement="right"
-      width="70%"
-      @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">
+  <a-drawer
+    :visible="Svisible"
+    class="drawerStyle StuScore"
+    placement="right"
+    width="70%"
+    @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">
-        
           <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
             <a-table
               style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns"
-                      :data-source="tabledata"
-                      :loading="tableDataTotal === -1 ? true : false"
-                      @expand="expandTable"
-                      :pagination="false"
-                    
+              :columns="tablecolumns"
+              :data-source="tabledata"
+              :loading="tableDataTotal === -1 ? true : false"
+              @expand="expandTable"
+              :pagination="false"
             />
             <div class="pa">
               <a-pagination
+                v-if="tableDataTotal > 10"
                 showSizeChanger="true"
                 showQuickJumper="true"
                 hideOnSinglePage="true"
@@ -37,291 +36,258 @@
                 :current="currentPage"
                 :total="tableDataTotal"
                 class="pagination"
+                @change="changePagination"
               />
             </div>
           </div>
         </div>
       </div>
-        <div class="btnn">
-          <button class="btn1" @click="closeDrawer">取消</button>
-          <button class="btn2" @click="closeDrawer">确定</button>
-        </div>
+      <div class="btnn">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
-    </a-drawer>
+    </div>
+  </a-drawer>
 </template>
   
 <script>
-  import { toRefs, reactive } from "vue";
-  export default {
-    name: "StuScoreDetail",
-    props: {
-      Svisible: {
-        type: Boolean,
-        default: false,
-      },
+import { toRefs, reactive } from "vue";
+import { studentScoreList } from "../../api/indexProjStu";
+import { toDate } from "@/api/method";
+export default {
+  name: "StuScoreDetail",
+  props: {
+    Svisible: {
+      type: Boolean,
+      default: false,
     },
-  
-    setup(props, ctx) {
-      const state = reactive({
-        name: null,
-        
+    studentId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+  },
+
+  setup(props, ctx) {
+    const state = reactive({
+      name: null,
+
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: null,
+      // selectedRowKeys: [],
+
+      tabledata: [
+        // {
+        //   key: 1,
+        //   time: "2019-12-12 12:12",
+        //   score: "12",
+        //   type: "完成任务",
+        //   from: "【在线】如何成为产品经理",
+        // },
+      ],
+      tablecolumns: [
+        {
+          title: "获取时间",
+          dataIndex: "time",
+          key: "time",
+          width: 40,
+          align: "left",
+          className: "h head",
+        },
+        {
+          title: "积分",
+          dataIndex: "score",
+          key: "score",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "来源",
+          dataIndex: "from",
+          key: "from",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
+      ],
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:Svisible", false);
+    };
+    const getData = () => {
+      let obj = {
+        pageNo: state.currentPage,
         pageSize: 10,
-        currentPage: 1,
-        tableDataTotal: 100,
-        selectedRowKeys: [],
-        
-        tabledata: [
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-          {
-            key: 1,
-            time: "2019-12-12 12:12",
-            score: "12",
-            type: "完成任务",
-            from: "【在线】如何成为产品经理",
-            
-          },
-        ],
-        tablecolumns: [
-          {
-            title: "获取时间",
-            dataIndex: "time",
-            key: "time",
-            width: 40,
-            align: "left",
-            className: "h head",
-          },
-          {
-            title: "积分",
-            dataIndex: "score",
-            key: "score",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "类型",
-            dataIndex: "type",
-            key: "type",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "来源",
-            dataIndex: "from",
-            key: "from",
-            width: 60,
-            align: "center",
-            className: "h",
-          },
-          
-        ],
+        projectId: props.projectId,
+        studentId: props.studentId,
+      };
+      studentScoreList(obj).then((res) => {
+        console.log("dede", res.data.data);
+        let result = res.data.data;
+        state.tableDataTotal = result.pageSize;
+        if (result.pageSize > 0) {
+          setTable(result.rows);
+        }
       });
-      const closeDrawer = () => {
-         ctx.emit("update:Svisible", false);
-      };
-      
-      return {
-        ...toRefs(state),
-        closeDrawer,
-       
-      };
-    },
-  };
+    };
+    const afterVisibleChange = () => {
+      getData();
+    };
+    const setTable = (tabledata) => {
+      let data = tabledata;
+      let array = [];
+      data.map((item) => {
+        let obj = {
+          time: toDate(item.createTime / 1000, "Y-M-D h-m"),
+          score: item.score,
+          type: "完成任务",
+          from: item.source,
+        };
+        array.push(obj);
+      });
+      state.tabledata = array;
+    };
+    const changePagination = (current) => {
+      state.currentPage = current;
+      getData();
+    };
+
+    return {
+      ...toRefs(state),
+      closeDrawer,
+      afterVisibleChange,
+      getData,
+      setTable,
+      changePagination,
+    };
+  },
+};
 </script>
   
 <style  lang="scss" >
-  .StuScore{
-    .drawerMain {
-      min-width: 600px;
-      margin: 0px 32px 0px 32px;
+.StuScore {
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
       display: flex;
-      flex-direction: column;
-      .header {
-        height: 73px;
-        border-bottom: 1px solid #e8e8e8;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        margin-bottom: 20px;
-        flex-shrink: 0;
-        .headerTitle {
-          font-size: 18px;
-          font-weight: 600;
-          color: #333333;
-          line-height: 25px;
-          // margin-left: 24px;
-        }
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 20px;
+      flex-shrink: 0;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
       }
-  
-      .main {
-        width: 100%;
-        height: 100%;
-        .endtime {
-          font-size: 16px;
-          font-weight: 500;
-          color: #333333;
-        }
-        .tableBox {
-          padding-bottom: 100px;
-          .ant-table-selection-column {
-            padding: 0px !important;
-            // padding-left: 45px !important;
-          }
-  
-          .ant-table-thead > tr > th {
-            background-color: rgba(239, 244, 252, 1) !important;
-            color: rgba(0, 0, 0, 0.8500);
-          }
-  
-          .ant-table-cell {
-            color: rgba(0, 0, 0, 0.6500);
-          }
-  
-          .ant-table-selection-column {
-            padding: 0 !important;
-          }
-  
-          th.h {
-            background-color: #eff4fc !important;
-          }
-  
-          
-          .ant-table-tbody
-            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-            > td {
-              
-            background: #f6f9fd;
-          }
-          .ant-table-tbody > tr > td {
-              border-bottom: 1px solid rgba(240, 244, 254, 1);
-              padding: 16px 16px;
-              .operation {
-              color: rgba(56, 125, 247, 1);
-              cursor: pointer;
-              }
-          }
-          .pa {
-            margin-top: 20px;
-            width: 100%;
-            flex:1;
-            display: flex;
-            justify-content: center;
-          }
-        }
+    }
+
+    .main {
+      width: 100%;
+      height: 100%;
+      .endtime {
+        font-size: 16px;
+        font-weight: 500;
+        color: #333333;
       }
-  
-      .btnn {
-        height: 72px;
-        width: 100%;
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-        background-color: #ffffff;
-        .btn1 {
-          width: 100px;
-          height: 40px;
-          border: 1px solid #4ea6ff;
-          border-radius: 8px;
-          color: #4ea6ff;
-          background-color: #fff;
-          cursor: pointer;
+      .tableBox {
+        padding-bottom: 100px;
+        .ant-table-selection-column {
+          padding: 0px !important;
+          // padding-left: 45px !important;
         }
-  
-        .btn2 {
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          background: #4ea6ff;
-          border-radius: 8px;
-          border: 0;
-          margin-left: 15px;
-          color: #fff;
+
+        .ant-table-thead > tr > th {
+          background-color: rgba(239, 244, 252, 1) !important;
+          color: rgba(0, 0, 0, 0.85);
+        }
+
+        .ant-table-cell {
+          color: rgba(0, 0, 0, 0.65);
+        }
+
+        .ant-table-selection-column {
+          padding: 0 !important;
+        }
+
+        th.h {
+          background-color: #eff4fc !important;
+        }
+
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
+          background: #f6f9fd;
+        }
+        .ant-table-tbody > tr > td {
+          border-bottom: 1px solid rgba(240, 244, 254, 1);
+          padding: 16px 16px;
+          .operation {
+            color: rgba(56, 125, 247, 1);
+            cursor: pointer;
+          }
+        }
+        .pa {
+          margin-top: 20px;
+          width: 100%;
+          flex: 1;
+          display: flex;
+          justify-content: center;
         }
       }
     }
+
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      background-color: #ffffff;
+      .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 918c39d7..9e40f8f7 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -213,9 +213,15 @@
           </div>
           <!-- 添加在线侧弹窗 -->
           <div>
-            <add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" v-model:edit="edit"
-              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
-              v-model:EditOnlineId="EditOnlineId" />
+            <add-online
+              v-model:addonlineVisible="addonlinevisible"
+              @changeData="updateTableData"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:projectTaskId="projectTaskId"
+              v-model:EditOnlineId="EditOnlineId"
+            />
           </div>
           <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
@@ -238,11 +244,17 @@
           </div>
           <!-- 添加案例侧弹窗 -->
           <div>
-              <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
-                v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
-                v-model:EditCaseId="EditCaseId" />
-            </div>
-            <!-- 添加案例侧弹窗 -->
+            <add-case
+              v-model:addcaseVisible="addcasevisible"
+              @changeData="updateTableData"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:projectTaskId="projectTaskId"
+              v-model:EditCaseId="EditCaseId"
+            />
+          </div>
+          <!-- 添加案例侧弹窗 -->
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -966,8 +978,8 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
-import AddOnline from "../../components/drawers/AddOnline.vue"
-import AddCase from "../../components/drawers/AddCase.vue"
+import AddOnline from "../../components/drawers/AddOnline.vue";
+import AddCase from "../../components/drawers/AddCase.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
@@ -1221,8 +1233,8 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
-      EditOnlineId:"", // 要编辑的 workid
-      EditCaseId:"",
+      EditOnlineId: "", // 要编辑的 workid
+      EditCaseId: "",
       EditWorkId: "",
       EditTestId: "",
       EditRefId: "",
@@ -1249,8 +1261,8 @@ export default {
       adddiscussvisible: false, //讨论抽屉
       isStudiscuss: false,
       addactivevisible: false, //活动抽屉
-      addonlinevisible:false,
-      addcasevisible:false,
+      addonlinevisible: false,
+      addcasevisible: false,
       addhomeworkvisible: false,
       addtestvisible: false,
       addevalvisible: false,
@@ -1272,6 +1284,7 @@ export default {
       projectId: null,
       projectTaskId: null,
       chooseStageId: null,
+      chooseChapterId: null,
     });
 
     //新建关卡
@@ -1328,17 +1341,17 @@ export default {
       state.isLevel = false;
     };
     //在线抽屉
-    const showDrawerAddOnline = (id,eleId)=>{
+    const showDrawerAddOnline = (id, eleId) => {
       state.addonlinevisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
-    }
+    };
     //案例抽屉
-    const showDrawerAddCase = (id,eleId)=>{
+    const showDrawerAddCase = (id, eleId) => {
       state.addcasevisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
-    }
+    };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
       console.log("homework==============", id, state.isactive);
@@ -1434,6 +1447,7 @@ export default {
       GetRouterDetail(state.routerId)
         .then((res) => {
           console.log("res.data.data.chapterList", res.data.data.chapterList);
+          //给level赋初始值
           state.level = res.data.data.chapterList;
           state.styTitle = res.data.data.routerInfo.name;
           state.creTime = toDate(
@@ -1448,8 +1462,14 @@ export default {
             item["label"] = item.name;
           });
           if (state.level.length > 0) {
-            dataAssignment(state.level[0].chapterId);
-            state.isactive = state.level[0].chapterId;
+            let chapter = localStorage.getItem("chapterId");
+            if (chapter !== null) {
+              dataAssignment(chapter);//用哪个的任务表
+              state.isactive = chapter;//哪个亮
+            } else {
+              dataAssignment(state.level[0].chapterId);
+              state.isactive = state.level[0].chapterId;
+            }
           }
           state.deleteModal = false;
         })
@@ -1674,6 +1694,7 @@ export default {
       state.selectRow = []; //选择行
       state.selectAll = 0; //0：未选择，1：全选，2：部分选择
       dataAssignment(chapterId);
+      state.chooseChapterId = chapterId;
     };
     const gqxy_hShow = () => {
       state.gqxy_hs = !state.gqxy_hs;
@@ -1811,6 +1832,8 @@ export default {
             console.log("移动成功", res);
             message.destroy();
             message.success("移动成功");
+            localStorage.setItem("chapterId", state.chooseChapterId);
+            getDetail();
           })
           .catch((err) => {
             console.log("移动失败", err);
@@ -1910,7 +1933,13 @@ export default {
     const rowSelection = {
       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;
@@ -1944,35 +1973,35 @@ export default {
           let arr = res.data.data.rows;
           if (res.status === 200) {
             getTableDate(arr);
-            console.log('---------------项目信息---------------------------');
+            console.log("---------------项目信息---------------------------");
           }
         })
         .catch((err) => {
           console.log("获取全部项目信息接口失败", err);
-          console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
+          console.log("+++++++++++++++++++++++++++++++++++++++++++++++");
           // state.createLoading = false;
         });
     };
     const updateTask = () => {
-        RouterEditTask({
-          chapterId: state.isactive,
-          courseId: state.assessmentId,
-          name: state.assessmentName,
-          routerId: state.routerId,
-          routerTaskId: state.routerTaskId || 0,
-          type: 13,
+      RouterEditTask({
+        chapterId: state.isactive,
+        courseId: state.assessmentId,
+        name: state.assessmentName,
+        routerId: state.routerId,
+        routerTaskId: state.routerTaskId || 0,
+        type: 13,
+      })
+        .then((res) => {
+          console.log(res, 11111);
+          message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
+          // ctx.emit("changeData", false);
+          closeDrawer();
+          state.addLoading = false;
         })
-          .then((res) => {
-            console.log(res, 11111);
-            message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`)
-            // ctx.emit("changeData", false);
-            closeDrawer();
-            state.addLoading = false;
-          })
-          .catch((err) => {
-            console.log(err, 1111);
-          });
-    }
+        .catch((err) => {
+          console.log(err, 1111);
+        });
+    };
     onMounted(() => {
       // createCase();
       getAllProjText();
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 8a83b195..48725a2e 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1395,6 +1395,7 @@ export default {
 
     //获取任务列表
     const getTask = () => {
+      // console.log("state.projectId", state.projectId);
       let obj = {
         projectId: state.projectId,
         // projectId: 28,
@@ -1409,28 +1410,30 @@ export default {
             state.picUrl = res.data.data.projectInfo.picUrl;
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-              // let stage = localStorage.getItem("stageId")
-              //   ? localStorage.getItem("stageId")
-              //   : null;
-              // if (stage !== null) {
-              //   // console.log("找到了origin", originStageList);
-              //   let originStageList = res.data.data.stageList.find((item) => {
-              //     item.stageId == stage;
-              //   });
-              //   getTableData(originStageList.taskList);
-              //   console.log("找到了origin", originStageList);
-              // } else {
-              //   let arr = res.data.data.stageList[0].taskList;
-              //   console.log("任务列表", arr);
-              //   getTableData(arr);
-              // }
-
               let stage = localStorage.getItem("stageId")
                 ? localStorage.getItem("stageId")
                 : null;
-              let arr = res.data.data.stageList[0].taskList;
-              console.log("任务列表", stage, arr);
-              getTableData(arr);
+              console.log("zhaodaole", stage);
+
+              if (stage !== null) {
+                let stageList = res.data.data.stageList; //阶段数组
+                let result = stageList.find((item) => item.stageId == stage);
+                console.log("又找到了", result);
+                getTableData(result.taskList);
+              } else {
+                let arr = res.data.data.stageList[0].taskList;
+                console.log("任务列表", arr);
+                getTableData(arr);
+              }
+              // let stageList = res.data.data.stageList; //阶段数组
+              // let result = stageList.find((item) => item.stageId == stage);
+              // console.log("又找到了", result);
+              // getTableData(result.taskList);
+
+              // 每次都获取了第一条taskList
+              // let arr = res.data.data.stageList[0].taskList;
+              // console.log("任务列表", stage, arr);
+              // getTableData(arr);
             }
 
             let stagearr = res.data.data.stageList;

From 5bd067c4d0a9599741c9c385bad0e374bf13ecb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Thu, 17 Nov 2022 16:26:17 +0800
Subject: [PATCH 61/90] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue    | 212 +++---
 src/components/drawers/AddCase.vue      | 411 ++++++-----
 src/components/drawers/AddDiscuss.vue   |   1 +
 src/components/drawers/AddEval.vue      | 196 ++---
 src/components/drawers/AddFaceteach.vue |   2 +
 src/components/drawers/AddHomework.vue  | 114 ++-
 src/components/drawers/AddInvist.vue    | 381 +++++-----
 src/components/drawers/AddLive.vue      |   3 +
 src/components/drawers/AddOnline.vue    | 523 +++++++-------
 src/components/drawers/AddRef.vue       | 277 +++----
 src/components/drawers/AddTest.vue      | 920 ++++++++++++++----------
 src/components/drawers/AddVote1.vue     |  33 +-
 src/components/drawers/AddVotebak.vue   | 142 ++--
 13 files changed, 1724 insertions(+), 1491 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 30b44ff3..7b0db77d 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -9,15 +9,14 @@
   >
     <div class="drawerMain">
       <div class="header">
-        
-        <div class="headerTitle">{{edit?'编辑':'添加'}}活动</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}活动</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
         />
       </div>
-        <div class="contentMain">
+      <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
@@ -72,7 +71,7 @@
           </div>
           <div class="main_item">
             <div class="signbox">
-            <div class="sign">
+              <div class="sign">
                 <img
                   src="@/assets/images/coursewareManage/asterisk.png"
                   alt=""
@@ -214,11 +213,11 @@
             </div>
           </div>
         </div>
-        </div>
+      </div>
       <div class="main_btns">
-          <button class="btn1" @click="closeDrawer">取消</button>
-          <button class="btn2" @click="updateActivityInfo">确定</button>
-        </div>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="updateActivityInfo">确定</button>
+      </div>
     </div>
   </a-drawer>
 </template>
@@ -226,9 +225,9 @@
 import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexActivity";
 import * as apiTask from "../../api/indexTaskadd";
-import { RouterEditTask } from "@/api/indexTask"
+import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -258,7 +257,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -274,15 +274,18 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
+    EditWorkId: {
+      // 要编辑的workId
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -293,7 +296,7 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
     //console.log("学习路径",props.isStudiscuss);
@@ -322,35 +325,46 @@ export default {
       state.textV1 = "";
       state.textV2 = "";
       state.time = "";
-      message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-    
+      message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const queryActive = () => {
-      console.log("props.EditActiveId======",props.EditActiveId,props.chooseStageId,props.routerTaskId);
-        api.getActivity(props.EditActiveId).then(res => {
-          console.log('获取讨论信息成功',res.data.data.standardSettings)
-          
+      console.log(
+        "props.EditActiveId======",
+        props.EditActiveId,
+        props.chooseStageId,
+        props.routerTaskId
+      );
+      api
+        .getActivity(props.EditActiveId)
+        .then((res) => {
+          console.log("获取讨论信息成功", res.data.data.standardSettings);
+
           //更新讨论信息
-          state.inputV1 =  res.data.data.activityName;
+          state.inputV1 = res.data.data.activityName;
           state.textV1 = res.data.data.activityNotice;
           state.textV2 = res.data.data.activityExplain;
           state.inputV2 = res.data.data.activityDuration;
           state.inputV3 = res.data.data.activityAddress;
           state.inputV5 = res.data.data.afterSignIn;
-          state.inputV6 =res.data.data.signOutTime;
+          state.inputV6 = res.data.data.signOutTime;
           state.inputV4 = res.data.data.beforeSignIn;
           state.radioV1 = Number(res.data.data.standardSettings);
-          
-          state.time = [dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD")]
-        }).catch(err=>{
-          console.log('获取讨论信息失败',err)
+
+          state.time = [
+            dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
+          ];
         })
-    }
+        .catch((err) => {
+          console.log("获取讨论信息失败", err);
+        });
+    };
     const afterVisibleChange = (bool) => {
-      if(bool && props.edit){
+      if (bool && props.edit) {
         queryActive();
       }
-      
     };
     const cloradio1 = (value) => {
       if (value != "") {
@@ -358,109 +372,109 @@ export default {
       }
     };
     const updateTask = (res) => {
-      if(props.isLevel == 1 ){
+      if (props.isLevel == 1) {
         RouterEditTask({
-            chapterId:props.isactive,
-            courseId: res.data.data.activityId,
-            duration: res.data.data.activityDuration,
-            name: res.data.data.activityName,
-            routerId: props.routerId,
-            routerTaskId: props.routerTaskId ||0,
-            type: 9,
-          }).then(res => {
-            console.log("新增关卡任务成功",res);
-           
-          }).catch(err => {
-            console.log("新增关卡任务失败",err);
+          chapterId: props.isactive,
+          courseId: res.data.data.activityId,
+          duration: res.data.data.activityDuration,
+          name: res.data.data.activityName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 9,
+        })
+          .then((res) => {
+            console.log("新增关卡任务成功", res);
           })
-      }else if(props.isLevel==2){
-        apiTask.addTask({
+          .catch((err) => {
+            console.log("新增关卡任务失败", err);
+          });
+      } else if (props.isLevel == 2) {
+        apiTask
+          .addTask({
             courseId: res.data.data.activityId,
             duration: res.data.data.activityDuration,
             name: res.data.data.activityName,
             projectId: props.projectId,
-            projectTaskId: props.projectTaskId ||0,
-            stageId:props.chooseStageId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
             type: 9,
-          }).then((res)=> {
-            console.log("更新任务列表成功",res);
-           
           })
-          .catch((err)=> {
-            console.log("更新任务列表失败",err);
+          .then((res) => {
+            console.log("更新任务列表成功", res);
           })
-      }else if(props.isLevel == 3){
+          .catch((err) => {
+            console.log("更新任务列表失败", err);
+          });
+      } else if (props.isLevel == 3) {
         console.log("模板库更新更新任务列表");
       }
-    }
+    };
     //创建活动
     const updateActivityInfo = () => {
-      if(!state.inputV1){
+      if (!state.inputV1) {
         message.destroy();
         return message.warning("请输入活动名称");
-      } 
-      if(!state.textV1){
+      }
+      if (!state.textV1) {
         message.destroy();
         return message.warning("请输入活动公告");
-      } 
-      if(!state.time){
+      }
+      if (!state.time) {
         message.destroy();
         return message.warning("请输入活动时间");
-      } 
-      if(!state.inputV2){
+      }
+      if (!state.inputV2) {
         message.destroy();
         return message.warning("请输入活动时长");
-      } 
-      if(!state.inputV3){
+      }
+      if (!state.inputV3) {
         message.destroy();
         return message.warning("请输入活动地址");
-      } 
-     
+      }
+
       let obj = {
-          activityAddress: state.inputV3, //活动地址
-          activityDuration: state.inputV2, //活动时长
-          activityExplain: state.textV2, //活动说明
-          activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
-          activityId: props.edit?props.EditActiveId:0, //活动ID
-          activityName: state.inputV1, //活动名称
-          activityNotice: state.textV1, //活动公告
-          activityStartTime:dayjs(state.time[0]).format("YYYY-MM-DD"),//活动开始时间
-          activityTag: "", //活动逻辑删除标识
-          afterSignIn: state.inputV5, //活动开始后多少分钟签到
-          beforeSignIn: state.inputV4, //活动开始前多少分钟签到
-          signOutTime: state.inputV6, //签退开始时间
-          standardSettings: state.radioV1, //标准设置
-          
+        activityAddress: state.inputV3, //活动地址
+        activityDuration: state.inputV2, //活动时长
+        activityExplain: state.textV2, //活动说明
+        activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
+        activityId: props.edit ? props.EditActiveId : 0, //活动ID
+        activityName: state.inputV1, //活动名称
+        activityNotice: state.textV1, //活动公告
+        activityStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), //活动开始时间
+        activityTag: "", //活动逻辑删除标识
+        afterSignIn: state.inputV5, //活动开始后多少分钟签到
+        beforeSignIn: state.inputV4, //活动开始前多少分钟签到
+        signOutTime: state.inputV6, //签退开始时间
+        standardSettings: state.radioV1, //标准设置
       };
-      if(props.edit){
+      if (props.edit) {
         //更新编辑活动信息
         api
-        .updateActivity(obj)
-        .then((res) => {
-          closeDrawer();
-          updateTask(res);
-          ctx.emit("changeData", false);
-      })
-      .catch((err) => {
-        console.log("更新失败",err);
-      })
-      }else{
+          .updateActivity(obj)
+          .then((res) => {
+            closeDrawer();
+            updateTask(res);
+            ctx.emit("changeData", false);
+          })
+          .catch((err) => {
+            console.log("更新失败", err);
+          });
+      } else {
         //新建活动信息
         api
-        .createActivity(obj)
-        .then((res) => {          
+          .createActivity(obj)
+          .then((res) => {
             message.success("创建成功");
             closeDrawer();
             updateTask(res);
             ctx.emit("changeData", false);
-        })
-        .catch((err) => {
-          console.log("创建失败",err);
-        })
+          })
+          .catch((err) => {
+            console.log("创建失败", err);
+          });
       }
-      
     };
-  
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -505,7 +519,7 @@ export default {
         border-radius: 8px;
       }
       .main_left {
-        margin-top:32px;
+        margin-top: 32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index de4d8c9d..ba1475b3 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -8,7 +8,7 @@
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">        
+      <div class="header">
         <div v-if="edit" class="headerTitle">编辑案例</div>
         <div v-else class="headerTitle">添加案例</div>
         <img
@@ -40,28 +40,37 @@
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
-            </div>
-            </div>
-            
-            <div class="main_table">
-              <a-table class="ant-table-striped" :row-class-name="
-                            (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-                          " :row-selection="rowSelection" :columns="tableDataFunc()" :data-source="tableData"
-                :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" this.getMilitaryDeployment()
-                @expand="expandTable" :pagination="false" filterMultiple:false
+          </div>
+        </div>
+
+        <div class="main_table">
+          <a-table
+            class="ant-table-striped"
+            :row-class-name="
+              (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
+            "
+            :row-selection="rowSelection"
+            :columns="tableDataFunc()"
+            :data-source="tableData"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            this.getMilitaryDeployment()
+            @expand="expandTable"
+            :pagination="false"
+            filterMultiple:false
           />
           <div class="pa">
-              <a-pagination
-                showSizeChanger="true"
-                showQuickJumper="true"
-                hideOnSinglePage="true"
-                :pageSize="pageSize"
-                :current="currentPage"
-                :total="tableDataTotal"
-                class="pagination"
-                @change="handelChangePage"
-              />
-            </div>
+            <a-pagination
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="handelChangePage"
+            />
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -90,7 +99,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -106,11 +116,13 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -121,14 +133,15 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       tableData: [
         {
           key: "1",
-          title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
+          title:
+            "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
           name: "李玉冰",
           time: "2022-10-31  23:12:00",
         },
@@ -136,7 +149,7 @@ export default {
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
-      inputV1: '',
+      inputV1: "",
       time: undefined,
       assessmentId: null,
       assessmentName: "",
@@ -144,6 +157,8 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addcaseVisible", false);
       ctx.emit("update:edit", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -179,7 +194,13 @@ export default {
     const rowSelection = {
       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;
@@ -228,8 +249,8 @@ export default {
         });
     };
     const updateTask = () => {
-      console.log("jinlaile=================", state.assessmentName)
-      if (props.isLevel==1) {
+      console.log("jinlaile=================", state.assessmentName);
+      if (props.isLevel == 1) {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: state.assessmentId,
@@ -240,7 +261,7 @@ export default {
         })
           .then((res) => {
             console.log(res, 11111);
-            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
@@ -248,7 +269,7 @@ export default {
           .catch((err) => {
             console.log(err, 1111);
           });
-      } else if(props.isLevel==2){
+      } else if (props.isLevel == 2) {
         console.log("=========projectTaskId", props.projectTaskId);
         apiTask
           .addTask({
@@ -267,10 +288,10 @@ export default {
           .catch((err) => {
             console.log(err, 111111);
           });
-      }else if(props.isLevel==3){
+      } else if (props.isLevel == 3) {
         console.log("模板库");
       }
-    }
+    };
     //重置案例信息
     const resetCase = () => {
       state.inputV1 = "";
@@ -297,181 +318,181 @@ export default {
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
-    background-color: #fafafa !important;
-  }
-  
-  .addcaseDrawer {
-    .drawerMain {
-      .header {
-        height: 73px;
-        border-bottom: 1px solid #e8e8e8;
+  background-color: #fafafa !important;
+}
+
+.addcaseDrawer {
+  .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 {
+      .main_items {
+        margin-top: 32px;
         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 {
-        .main_items {
-          margin-top:32px;
+        margin-bottom: 12px;
+        flex-wrap: wrap;
+        .mi_ipts {
           display: flex;
-          justify-content: space-between;
-          margin-bottom: 12px;
-          flex-wrap: wrap;
-          .mi_ipts {
+          margin-bottom: 20px;
+          .mii_ipt {
             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;
-              }
+            align-items: center;
+            margin-right: 24px;
+            .ipt_name {
+              white-space: nowrap;
             }
           }
         }
-        .main_table {
-          position: relative;
-            padding-bottom: 80px;
-            .classify {
-              margin-left: 10px !important;
-              padding-left: 9px !important;
+        .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%;
             }
-            .ant-checkbox-wrapper {
-              align-items: center;
-              margin-top: -2px;
-            }
-            .ant-table-selection-column {
-              padding: 0px !important;
-              padding-left:15px !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;
+            .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_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;
+      .main_table {
+        position: relative;
+        padding-bottom: 80px;
+        .classify {
+          margin-left: 10px !important;
+          padding-left: 9px !important;
         }
-        .btn2 {
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          background: #4ea6ff;
-          border-radius: 8px;
-          border: 0;
-          margin-left: 15px;
-          color: #fff;
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -2px;
+        }
+        .ant-table-selection-column {
+          padding: 0px !important;
+          padding-left: 15px !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/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 82c753f3..7cd9a3c9 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -174,6 +174,7 @@ export default {
       state.inputV1 = "";
       state.textV1 = "";
       message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+      // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index daf6e24b..b934924f 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -9,7 +9,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{edit?'编辑':'添加'}}测评</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}测评</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -48,16 +48,18 @@
               <span style="margin-right: 3px">选择测评：</span>
             </div>
             <div class="btnbox">
-              <button class="checkEval" @click="showEvalDrawer">选择测评</button>
+              <button class="checkEval" @click="showEvalDrawer">
+                选择测评
+              </button>
             </div>
             <div>
-           <div><EvList
-                v-model:EvalListVisible="EvalListVisible"
-                v-model:evaluationTypeId="evaluationTypeId"
-                v-model:evaluationTypeName="evaluationTypeName"
-              />
-           </div>
-        
+              <div>
+                <EvList
+                  v-model:EvalListVisible="EvalListVisible"
+                  v-model:evaluationTypeId="evaluationTypeId"
+                  v-model:evaluationTypeName="evaluationTypeName"
+                />
+              </div>
             </div>
           </div>
           <div class="main_item">
@@ -78,8 +80,12 @@
               <span style="margin-right: 3px">测评说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea v-model:value="description" placeholder="请输入测评说明" style="width:424px; height: 120px;" allowClear/>
-                
+              <a-textarea
+                v-model:value="description"
+                placeholder="请输入测评说明"
+                style="width: 424px; height: 120px"
+                allowClear
+              />
             </div>
           </div>
         </div>
@@ -102,11 +108,11 @@ import * as api from "../../api/indexEval";
 import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { RouterEditTask } from "@/api/indexTask";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 // const router = useRouter();
 export default {
   name: "AddEval",
-   components: {
+  components: {
     EvList,
   },
   props: {
@@ -118,7 +124,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -134,11 +141,13 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -157,10 +166,10 @@ export default {
       inputV2: "",
       time: undefined,
       EvalId: null,
-      evaluationTypeId:null,
-      evaluationTypeName:"",
-      description:"",
-      EvalListVisible:false,
+      evaluationTypeId: null,
+      evaluationTypeName: "",
+      description: "",
+      EvalListVisible: false,
       // addLoading:false,
     });
 
@@ -169,67 +178,72 @@ export default {
       ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.inputV2 = "";
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
-      if(props.edit && bool){
+      if (props.edit && bool) {
         queryEval();
       }
     };
-    const showEvalDrawer = () =>{
+    const showEvalDrawer = () => {
       state.EvalListVisible = true;
       console.log("进来了吗");
     };
-    const queryEval = () =>{
+    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 = 
+        .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 ==1){
+    };
+    const updateTask = (res) => {
+      if (props.isLevel == 1) {
         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 if(props.isLevel ==2){
+          .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 if (props.isLevel == 2) {
         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);
-            });
-      }else if(props.isLevel ==3){
-          console.log("模板库任务")
+          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);
+          });
+      } else if (props.isLevel == 3) {
+        console.log("模板库任务");
       }
-    }
+    };
     //创建或编辑测评信息
     const createEvalText = () => {
       if (!state.inputV1) {
@@ -248,36 +262,36 @@ export default {
       let obj = {
         evaluationName: state.inputV1,
         evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
-        evaluationId: props.edit?props.evaluationId:0,
+        evaluationId: props.edit ? props.evaluationId : 0,
         evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
-        evaluationTypeId:state.evaluationTypeId,
-        evaluationTypeName:state.evaluationTypeName,
+        evaluationTypeId: state.evaluationTypeId,
+        evaluationTypeName: state.evaluationTypeName,
         //state.description
       };
-      if(props.edit){
+      if (props.edit) {
         api
-        .createEvaluation(obj)
-        .then((res) => {
-          updateTask(res);
-          message.success("创建成功");
-          closeDrawer();
-          ctx.emit("changeData", false);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-      }else{
+          .createEvaluation(obj)
+          .then((res) => {
+            updateTask(res);
+            message.success("创建成功");
+            closeDrawer();
+            ctx.emit("changeData", false);
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
         api
-        .updateEvaluation(obj)
-        .then((res) => {
-          updateTask(res);
-          message.success("创建成功");
-          closeDrawer();
-          ctx.emit("changeData", false);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+          .updateEvaluation(obj)
+          .then((res) => {
+            updateTask(res);
+            message.success("创建成功");
+            closeDrawer();
+            ctx.emit("changeData", false);
+          })
+          .catch((err) => {
+            console.log(err);
+          });
       }
     };
 
@@ -318,7 +332,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .main_left {
-        margin-top:32px;
+        margin-top: 32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 25a37258..a6b099c3 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -384,6 +384,8 @@ export default {
       ctx.emit("update:addfaceteachVisible", false);
       state.radioV1 = "";
       state.radioV2 = "";
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 8c0dbe82..e1149ca0 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -279,6 +279,9 @@ export default {
       formState.choosedTime = "";
       ctx.emit("update:addhomeworkVisible", false);
       ctx.emit("update:edit", false);
+      ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       if (props.addhomeworkVisible && props.edit) {
@@ -288,38 +291,35 @@ export default {
       console.log("state", bool);
     };
 
-
-
     // 新增任务
     const updteHomeWork = () => {
       let obj = {
         submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
         submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
         workEnclosureAddress: "",
-        workId: props.edit?props.EditWorkId:0,
+        workId: props.edit ? props.EditWorkId : 0,
         workName: formState.workName,
         workRequirement: formState.workRequirement,
       };
-      if(props.edit){
+      if (props.edit) {
         updateWorkTaskUsing(obj)
-        .then((res) => {
-          updateTask(res);
-          closeDrawer();
-        })
-        .catch((err) => {
-          message.error(`添加失败${err}`);
-        });
-      }else{
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+          })
+          .catch((err) => {
+            message.error(`添加失败${err}`);
+          });
+      } else {
         createWorkTask(obj)
-        .then((res) => {
-          updateTask(res);
-          closeDrawer();
-        })
-        .catch((err) => {
-          message.error(`添加失败${err}`);
-        });
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+          })
+          .catch((err) => {
+            message.error(`添加失败${err}`);
+          });
       }
-      
     };
 
     // 查询任务
@@ -345,50 +345,48 @@ export default {
     };
     // 新增编辑或新增项目任务
     const updateTask = (res) => {
-      if(props.isLevel==1 ){
+      if (props.isLevel == 1) {
         let editObj1 = {
-        chapterId: props.isactive,
-        courseId: res.data.data.workId,
-        name: res.data.data.workName,
-        routerId: props.routerId,
-        routerTaskId: props.routerTaskId || 0,
-        type: 4,
-      };
+          chapterId: props.isactive,
+          courseId: res.data.data.workId,
+          name: res.data.data.workName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 4,
+        };
 
-      RouterEditTask(editObj1)
-        .then(() => {
-          message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-          ctx.emit("changeData", false);
-          state.addLoading = false;
-        })
-        .catch(() => {
-          message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-        });
-      }else if(props.isLevel==2){
+        RouterEditTask(editObj1)
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+            state.addLoading = false;
+          })
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
+      } else if (props.isLevel == 2) {
         let editObj = {
-        courseId: res.data.data.workId,
-        name:res.data.data.workName,
-        projectId: props.edit?props.projectId:0,
-        projectTaskId: props.projectTaskId || 0,
-        stageId: props.chooseStageId,
-        type: 4,
-      };
-      ProjectEditTask(editObj)
-        .then(() => {
-          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          ctx.emit("changeData", false);
-          state.addLoading = false;
-        })
-        .catch(() => {
-          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-        });
-      }else if(props.isLevel==3){
+          courseId: res.data.data.workId,
+          name: res.data.data.workName,
+          projectId: props.edit ? props.projectId : 0,
+          projectTaskId: props.projectTaskId || 0,
+          stageId: props.chooseStageId,
+          type: 4,
+        };
+        ProjectEditTask(editObj)
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            ctx.emit("changeData", false);
+            state.addLoading = false;
+          })
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
+      } else if (props.isLevel == 3) {
         console.log("模板库更新更新任务列表");
       }
-      
     };
 
-
     return {
       afterVisibleChange,
       closeDrawer,
@@ -440,7 +438,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
-        margin-top:32px;
+        margin-top: 32px;
 
         .main_item {
           display: flex;
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index f7140bef..e6d9fa53 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -18,51 +18,61 @@
         />
       </div>
       <div class="contentMain">
-      <div class="main">
-        <div class="main_left">
-          <div class="main_notice">
-          <div class="mntc_left">
-            <div class="notice_icon"></div>
-           <div v-if="assessment==null"> 
-            <span class="title">已选择 <span class ="data">0</span> 条</span>
-           </div>
-           <div v-else> 
-            <span class="title">已选择 <span class ="data">1</span> 条;</span>
-            <span class="title">名称： <span class ="data">{{assessment.name}}</span> </span>
-            <span class="title">题数： <span class ="data">{{assessment.num}}</span> </span>
-            <span class="title">创建人： <span class ="data">{{assessment.creator}}</span> </span>
-            <span class="title">创建时间： <span class ="data">{{assessment.time}}</span> </span>
-           </div>
-          </div>
-           
-          </div>
-          <div class="main_item">
-            <div class="fi_input">
-        
-            <div class="btns" @click="checkAssDrawer">
-              <div class="search"></div>
-              <div class="btnText">选择评估</div>
-              <div class="main_item2">
-              <AssessmentList 
-              v-model:assessmentVisible="assessmentVisible"
-              @checkedAss="getCheckedAss"/>
+        <div class="main">
+          <div class="main_left">
+            <div class="main_notice">
+              <div class="mntc_left">
+                <div class="notice_icon"></div>
+                <div v-if="assessment == null">
+                  <span class="title"
+                    >已选择 <span class="data">0</span> 条</span
+                  >
+                </div>
+                <div v-else>
+                  <span class="title"
+                    >已选择 <span class="data">1</span> 条;</span
+                  >
+                  <span class="title"
+                    >名称： <span class="data">{{ assessment.name }}</span>
+                  </span>
+                  <span class="title"
+                    >题数： <span class="data">{{ assessment.num }}</span>
+                  </span>
+                  <span class="title"
+                    >创建人： <span class="data">{{ assessment.creator }}</span>
+                  </span>
+                  <span class="title"
+                    >创建时间： <span class="data">{{ assessment.time }}</span>
+                  </span>
+                </div>
+              </div>
             </div>
+            <div class="main_item">
+              <div class="fi_input">
+                <div class="btns" @click="checkAssDrawer">
+                  <div class="search"></div>
+                  <div class="btnText">选择评估</div>
+                  <div class="main_item2">
+                    <AssessmentList
+                      v-model:assessmentVisible="assessmentVisible"
+                      @checkedAss="getCheckedAss"
+                    />
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
-         
+          <div class="main_btns">
+            <button class="btn1" @click="closeDrawer">取消</button>
+            <button class="btn2" @click="updateTask">确定</button>
+          </div>
         </div>
       </div>
-      <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="updateTask">确定</button>
-      </div>
     </div>
-  </div>
-  </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import AssessmentList from "./ AssessmentList.vue";
@@ -81,7 +91,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -97,12 +108,14 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
-  
-    projectTaskId: { // 要编辑的projectId 
+
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -114,7 +127,6 @@ export default {
       type: Number,
       default: null,
     },
-  
   },
   setup(props, ctx) {
     const state = reactive({
@@ -123,79 +135,79 @@ export default {
       currentPage: 1,
       pageSize: 10,
       tableDataTotal: 0,
-      tableData: [
-      ],
-      assessmentId:null,
-      assessmentName:"",
-      assessment:null,
-      assessmentVisible:false,
-     
+      tableData: [],
+      assessmentId: null,
+      assessmentName: "",
+      assessment: null,
+      assessmentVisible: false,
     });
-    const getCheckedAss = (ass) =>{
-      state.assessment = ass
-      console.log("checed===",state.assessment);
-    }
+    const getCheckedAss = (ass) => {
+      state.assessment = ass;
+      console.log("checed===", state.assessment);
+    };
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
       ctx.emit("update:edit", false);
       state.inputV1 = "";
+      // ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
-    const checkAssDrawer =() =>{
+    const checkAssDrawer = () => {
       state.assessmentVisible = true;
-    }
+    };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      state.assessmentId=null;
-      state.assessmentName="";
-      state.assessment=null;
+      state.assessmentId = null;
+      state.assessmentName = "";
+      state.assessment = null;
     };
 
-    const updateTask =()=>{
-      if(state.assessment==null){
+    const updateTask = () => {
+      if (state.assessment == null) {
         return message.warning("请选择评估");
       }
-      if(props.isLevel ==1){
+      if (props.isLevel == 1) {
         RouterEditTask({
-              chapterId: props.isactive,
-              courseId: state.assessment.assessmentId,
-              name:state.assessment.name,
-              routerId: props.routerId,
-              routerTaskId: props.routerTaskId || 0,
-              type: 11,
-            })
-              .then((res) => {
-                console.log(res, 11111);
-                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-                ctx.emit("changeData", false);
-                closeDrawer();
-                state.addLoading = false;               
-              })
-              .catch((err) => {
-                console.log(err, 1111);
-              });
-      }else if(props.isLevel ==2){
+          chapterId: props.isactive,
+          courseId: state.assessment.assessmentId,
+          name: state.assessment.name,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 11,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } else if (props.isLevel == 2) {
         apiTask
-            .addTask({
-              courseId: state.assessment.assessmentId,
-              name:state.assessment.name,
-              projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId,
-              type: 11,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后111", res.data, 11111);
-              ctx.emit("changeData", false); 
-              closeDrawer();    
-            })
-            .catch((err) => {
-              console.log(err, 111111);
-            });
-      }else if(props.isLevel == 3){
+          .addTask({
+            courseId: state.assessment.assessmentId,
+            name: state.assessment.name,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 11,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      } else if (props.isLevel == 3) {
         console.log("模板库更新更新任务列表");
       }
-    }
- 
+    };
 
     return {
       ...toRefs(state),
@@ -232,107 +244,104 @@ export default {
     .contentMain {
       display: flex;
       justify-content: space-between;
-      .main{
-        width:100%;
-      .main_left {
-        padding-right: 30px;
-        margin-top:32px;
-        .main_item {
-          display: flex;
-          align-items: center;
-          margin-bottom: 64px;
-          .fi_input {
-            margin-right: 20px;
-         
-          }
-          .btns {
-            margin-right: 20px;
-            padding: 0px 26px 0px 26px;
-            height: 38px;
-            background: #409eff;
-            border-radius: 8px;
-            //border: 1px solid rgba(64, 158, 255, 1);
+      .main {
+        width: 100%;
+        .main_left {
+          padding-right: 30px;
+          margin-top: 32px;
+          .main_item {
             display: flex;
             align-items: center;
-            justify-content: center;
-            margin-right: 14px;
-            flex-shrink: 0;
-            cursor: pointer;
-            .search {
-              width: 15px;
-              height: 17px;
-              background-image: url("../../assets/images/courseManage/search0.png");
-              background-size: 100% 100%;
+            margin-bottom: 64px;
+            .fi_input {
+              margin-right: 20px;
             }
-            .btnText {
-              font-size: 14px;
-              font-weight: 400;
-              color: #ffffff;
-              line-height: 36px;
-              margin-left: 5px;
+            .btns {
+              margin-right: 20px;
+              padding: 0px 26px 0px 26px;
+              height: 38px;
+              background: #409eff;
+              border-radius: 8px;
+              //border: 1px solid rgba(64, 158, 255, 1);
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-right: 14px;
+              flex-shrink: 0;
+              cursor: pointer;
+              .search {
+                width: 15px;
+                height: 17px;
+                background-image: url("../../assets/images/courseManage/search0.png");
+                background-size: 100% 100%;
+              }
+              .btnText {
+                font-size: 14px;
+                font-weight: 400;
+                color: #ffffff;
+                line-height: 36px;
+                margin-left: 5px;
+              }
+            }
+            .btnsn {
+              padding: 0px 26px 0px 26px;
+              height: 38px;
+              background: #ffffff;
+              border-radius: 8px;
+              border: 1px solid rgba(64, 158, 255, 1);
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-right: 14px;
+              flex-shrink: 0;
+              cursor: pointer;
+              .search {
+                width: 16px;
+                height: 18px;
+                background-image: url("../../assets/images/courseManage/reset1.png");
+                background-size: 100% 100%;
+              }
+              .btnText {
+                font-size: 14px;
+                font-weight: 400;
+                color: #409eff;
+                line-height: 36px;
+                margin-left: 5px;
+              }
             }
           }
-          .btnsn {
-            padding: 0px 26px 0px 26px;
-            height: 38px;
-            background: #ffffff;
-            border-radius: 8px;
-            border: 1px solid rgba(64, 158, 255, 1);
+          .main_notice {
             display: flex;
+            justify-content: space-between;
             align-items: center;
-            justify-content: center;
-            margin-right: 14px;
-            flex-shrink: 0;
-            cursor: pointer;
-            .search {
-              width: 16px;
-              height: 18px;
-              background-image: url("../../assets/images/courseManage/reset1.png");
-              background-size: 100% 100%;
+            margin-bottom: 32px;
+            height: 40px;
+            background-color: #e9f6fe;
+            .mntc_left {
+              display: flex;
+              align-items: center;
+              .title {
+                color: rgba(0, 0, 0, 0.65);
+                margin-right: 17px;
+              }
+              .data {
+                color: #388be1;
+              }
+              .notice_icon {
+                width: 14px;
+                height: 14px;
+                margin-right: 9px;
+                margin-left: 9px;
+                background-image: url(@/assets/images/coursewareManage/gan.png);
+                background-size: 100% 100%;
+              }
             }
-            .btnText {
-              font-size: 14px;
-              font-weight: 400;
-              color: #409eff;
-              line-height: 36px;
-              margin-left: 5px;
+            .mntc_right {
+              cursor: pointer;
             }
           }
         }
-        .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;
-            .title{
-              color: rgba(0, 0, 0, 0.65);
-               margin-right: 17px
-            }
-            .data{
-              color: #388be1
-            }
-            .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_btns {
       height: 72px;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 4fb4265b..16f64910 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -445,6 +445,9 @@ export default {
       state.textV1 = "";
       state.switchC1 = "";
       state.imageUrl = "";
+      ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       console.log("props.edit===================", props.edit, bool);
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index df97f7e7..e58e5bfc 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -8,7 +8,7 @@
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">        
+      <div class="header">
         <div v-if="edit" class="headerTitle">编辑在线</div>
         <div v-else class="headerTitle">添加在线</div>
         <img
@@ -59,10 +59,10 @@
           <div class="mntc_left">
             <div class="notice_icon"></div>
             <span style="color: rgba(0, 0, 0, 0.65); margin-right: 17px"
-              >已选择 <span style="color: #388be1">{{RowsNum}}</span> 项</span
+              >已选择 <span style="color: #388be1">{{ RowsNum }}</span> 项</span
             >
             <span style="color: rgba(0, 0, 0, 0.65)"
-              >列表选项总计：<span>{{tableDataTotal}}</span> 条</span
+              >列表选项总计：<span>{{ tableDataTotal }}</span> 条</span
             >
           </div>
           <div class="mntc_right">
@@ -79,24 +79,24 @@
             :columns="tableDataFunc()"
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-        		this.getMilitaryDeployment()
-              @expand="expandTable"
+            expandRowByClick="true"
+            this.getMilitaryDeployment()
+            @expand="expandTable"
             :pagination="false"
-              filterMultiple:false
+            filterMultiple:false
           />
           <div class="pa">
-                <a-pagination
-                  showSizeChanger="true"
-                  showQuickJumper="true"
-                  hideOnSinglePage="true"
-                  :pageSize="pageSize"
-                  :current="currentPage"
-                  :total="tableDataTotal"
-                  class="pagination"
-                  @change="handelChangePage"
-                />
-              </div>
+            <a-pagination
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="handelChangePage"
+            />
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -124,7 +124,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -140,11 +141,13 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -155,20 +158,20 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   },
   setup(props, ctx) {
     const state = reactive({
-      inputV1:"",
-      options1 : [
+      inputV1: "",
+      options1: [
         {
           value: "value1",
           label: "未完成",
         },
       ],
       time: undefined,
-      assessmentId:null,
-      assessmentName:"",
+      assessmentId: null,
+      assessmentName: "",
       RowsNum: 0,
       tableData: [],
       currentPage: 1,
@@ -178,6 +181,9 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addonlineVisible", false);
       ctx.emit("update:edit", false);
+      // ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -199,7 +205,8 @@ export default {
           width: "100px",
           align: "left",
           className: "classify",
-        }, {
+        },
+        {
           title: "内容分类",
           dataIndex: "content",
           key: "content",
@@ -235,19 +242,25 @@ export default {
       onSelectAll: (selected) => {
         console.log(selected);
         if (selected == true) {
-          state.RowsNum = state.tableDataTotal
+          state.RowsNum = state.tableDataTotal;
         } else {
-          state.RowsNum = 0
+          state.RowsNum = 0;
         }
       },
       onSelect: (selectedRows, selected, selectedRowKeys) => {
         console.log(
-          "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+          "selectedRowKeys",
+          selectedRowKeys,
+          "selectedRows",
+          selectedRows,
+          "selected",
+          selected
+        );
         console.log(selectedRows.assessmentId);
         if (selected == true) {
-          state.RowsNum++
+          state.RowsNum++;
         } else {
-          state.RowsNum--
+          state.RowsNum--;
         }
         state.assessmentId = selectedRows.assessmentId;
         state.assessmentName = selectedRows.name;
@@ -295,49 +308,49 @@ export default {
           // state.createLoading = false;
         });
     };
-  const updateTask =()=>{
-      if(props.isLevel ==1){
+    const updateTask = () => {
+      if (props.isLevel == 1) {
         RouterEditTask({
-              chapterId: props.isactive,
-              courseId: state.assessmentId,
-              name: state.assessmentName,
-              routerId: props.routerId,
-              routerTaskId: props.routerTaskId || 0,
-              type: 1,
-            })
-              .then((res) => {
-                console.log(res, 11111);
-                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-                ctx.emit("changeData", false);
-                closeDrawer();
-                state.addLoading = false;               
-              })
-              .catch((err) => {
-                console.log(err, 1111);
-              });
-      }else if(props.isLevel ==2){
-        console.log("=========projectTaskId",props.projectTaskId);
+          chapterId: props.isactive,
+          courseId: state.assessmentId,
+          name: state.assessmentName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 1,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } else if (props.isLevel == 2) {
+        console.log("=========projectTaskId", props.projectTaskId);
         apiTask
-            .addTask({
-              courseId: state.assessmentId,
-              name: state.assessmentName,
-              projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId,
-              type: 1,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后111", res.data, 11111);
-              ctx.emit("changeData", false); 
-              closeDrawer();    
-            })
-            .catch((err) => {
-              console.log(err, 111111);
-            });
-      }else if(props.isLevel ==3){
+          .addTask({
+            courseId: state.assessmentId,
+            name: state.assessmentName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 1,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      } else if (props.isLevel == 3) {
         console.log("");
       }
-    }
+    };
     //重置在线信息
     const resetOnline = () => {
       state.inputV1 = "";
@@ -367,201 +380,201 @@ export default {
   background-color: #fafafa !important;
 }
 .addonlineDrawer {
-    .drawerMain {
-      .header {
-        height: 73px;
-        border-bottom: 1px solid #e8e8e8;
+  .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;
+        justify-content: space-between;
+        margin-top: 32px;
+        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;
-        flex-shrink: 0;
-        .headerTitle {
-          font-size: 18px;
-          font-weight: 600;
-          color: #333333;
-          line-height: 25px;
-          margin-left: 24px;
-        }
-      }
-      .contentMain {
-          padding-right: 12px;
-        .main_items {
+        margin-bottom: 32px;
+        height: 40px;
+        background-color: #e9f6fe;
+        .mntc_left {
           display: flex;
-          justify-content: space-between;
-          margin-top: 32px;
-          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;
+          .notice_icon {
+            width: 14px;
+            height: 14px;
+            margin-right: 9px;
+            margin-left: 9px;
+            background-image: url(@/assets/images/coursewareManage/gan.png);
+            background-size: 100% 100%;
           }
         }
-        .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;
-            }
-          }
+        .mntc_right {
+          cursor: pointer;
+        }
       }
-
-      .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;
+      .main_table {
+        position: relative;
+        padding-bottom: 80px;
+        .classify {
+          margin-left: 10px !important;
+          padding-left: 9px !important;
         }
-        .btn2 {
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          background: #4ea6ff;
-          border-radius: 8px;
-          border: 0;
-          margin-left: 15px;
-          color: #fff;
+        .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/AddRef.vue b/src/components/drawers/AddRef.vue
index 0be363bf..d9ac10ca 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -8,68 +8,76 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{edit ? '编辑' : '添加' }}外链</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}外链</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
         />
       </div>
-      <a-form ref="formRef" name="custom-validation" :model="state" :rules="rules" v-bind="layout"
-        @finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
-      <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=""
+      <a-form
+        ref="formRef"
+        name="custom-validation"
+        :model="state"
+        :rules="rules"
+        v-bind="layout"
+        @finish="handleFinish"
+        @validate="handleValidate"
+        @finishFailed="handleFinishFailed"
+      >
+        <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>
-              <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 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="inputV2"
+                  style="width: 424px; height: 32px"
+                  placeholder="请输入链接"
                 />
               </div>
-              <span style="margin-right: 3px">链接：</span>
             </div>
-            <div class="btnbox">
-              <a-input
-                v-model:value="inputV2"
-                style="width: 424px; height: 32px"
-                placeholder="请输入链接"
-              />
-            </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
-              />
+            <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
+                />
+              </div>
             </div>
           </div>
         </div>
-      </div>
       </a-form>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
@@ -114,7 +122,8 @@ export default {
       type: Number,
       default: null,
     },
-    edit: { //  是否为编辑
+    edit: {
+      //  是否为编辑
       type: Boolean,
       default: null,
     },
@@ -130,12 +139,14 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
 
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -146,8 +157,7 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
-  
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -164,115 +174,120 @@ export default {
       state.inputV2 = "";
       state.inputV1 = "";
       state.textV1 = "";
+      // ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
 
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-  
-      if(props.edit){
+
+      if (props.edit) {
         queryRef();
       }
-      
     };
-    const handleFinish = values => {
+    const handleFinish = (values) => {
       console.log(values);
       //updateRef(props.EditRefId)
     };
-    const handleFinishFailed = errors => {
+    const handleFinishFailed = (errors) => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
-    const updateTask =(res)=>{
-      
-      if(props.isLevel ==1){
+    const updateTask = (res) => {
+      if (props.isLevel == 1) {
         RouterEditTask({
-              chapterId: props.isactive,
-              courseId: res.data.data.linkId,
-              name: res.data.data.linkName,
-              routerId: props.routerId,
-              routerTaskId: props.routerTaskId || 0,
-              type: 7,
-            })
-              .then((res) => {
-                console.log(res, 11111);
-                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-                ctx.emit("changeData", false);
-                closeDrawer();
-                state.addLoading = false;               
-              })
-              .catch((err) => {
-                console.log(err, 1111);
-              });
-      }else if(props.isLevel ==2){
+          chapterId: props.isactive,
+          courseId: res.data.data.linkId,
+          name: res.data.data.linkName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 7,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } else if (props.isLevel == 2) {
         apiTask
-            .addTask({
-              courseId:res.data.data.linkId,
-              name: res.data.data.linkName,
-              projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId,
-              type: 7,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后111", res.data, 11111);
-              ctx.emit("changeData", false); 
-              closeDrawer();    
-            })
-            .catch((err) => {
-              console.log(err, 111111);
-            });
-      }else if(props.isLevel ==3){
+          .addTask({
+            courseId: res.data.data.linkId,
+            name: res.data.data.linkName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 7,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      } else if (props.isLevel == 3) {
         console.log("");
       }
-    }
+    };
     //创建外链
     const updateRef = () => {
       if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2){
+      if (!state.inputV2) {
         return message.warning("请输入链接");
-      }else{
-        const reg = /(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
-        if ((!reg.test(state.inputV2)) && state.inputV2 != '') {
+      } else {
+        const reg =
+          /(https?|ftp|file):\/\/[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]/;
+        if (!reg.test(state.inputV2) && state.inputV2 != "") {
           return message.warning("请输入合法的链接地址");
-        } 
-      } 
-      let obj = {   
+        }
+      }
+      let obj = {
         linkAddress: state.inputV2,
         linkDescription: state.textV1,
-        linkId:props.edit?props.EditRefId:0,
-        linkName: state.inputV1, 
+        linkId: props.edit ? props.EditRefId : 0,
+        linkName: state.inputV1,
       };
-      console.log("编辑的id========",props.EditRefId)
-      if(props.edit){
+      console.log("编辑的id========", props.EditRefId);
+      if (props.edit) {
         api
-        .updateLinks(obj)
-        .then((res) => {
-          message.success("编辑成功");
-          updateTask(res);  
-        }).catch((err) => console.log(err));
-      }else{
+          .updateLinks(obj)
+          .then((res) => {
+            message.success("编辑成功");
+            updateTask(res);
+          })
+          .catch((err) => console.log(err));
+      } else {
         api
-        .createExternalChain(obj)
-        .then((res) => {
-          message.success("提交成功");
-          updateTask(res);                
-        }).catch((err) => console.log(err));
+          .createExternalChain(obj)
+          .then((res) => {
+            message.success("提交成功");
+            updateTask(res);
+          })
+          .catch((err) => console.log(err));
       }
-      
     };
-        // 查询任务
+    // 查询任务
     const queryRef = () => {
-      let d =props.EditRefId ;
+      let d = props.EditRefId;
       api
-      .getLink({linkId:d}).then((res) => {
-       // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
-        state.inputV1 = res.data.data.linkName;
-        state.inputV2 =res.data.data.linkAddress;
-        state.textV1 =res.data.data.linkDescription;
-        console.log("查询成功=====inputv1",state.inputV1);
-      }).catch(() => {
-        message.error(`查询失败`)
-      })
+        .getLink({ linkId: d })
+        .then((res) => {
+          // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+          state.inputV1 = res.data.data.linkName;
+          state.inputV2 = res.data.data.linkAddress;
+          state.textV1 = res.data.data.linkDescription;
+          console.log("查询成功=====inputv1", state.inputV1);
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
     };
     return {
       ...toRefs(state),
@@ -314,7 +329,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
-        margin-top:32px;
+        margin-top: 32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 0432d2e2..1da3069a 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{edit ? "编辑" : "添加" }}考试</div>
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -16,51 +16,69 @@
         />
       </div>
       <div style="display: flex; flex-direction: row">
-        <button style="width:100px;"
-        @click="changeOuter(1)"
-         :class="[isOuter == 1? 'outer' : 'notOuter' ]">系统考试</button>
-      <button style="width:100px;" @click="changeOuter(2)"
-       :class="[isOuter == 2? 'outer' : 'notOuter' ]" >外部考试</button>
+        <button
+          style="width: 100px"
+          @click="changeOuter(1)"
+          :class="[isOuter == 1 ? 'outer' : 'notOuter']"
+        >
+          系统考试
+        </button>
+        <button
+          style="width: 100px"
+          @click="changeOuter(2)"
+          :class="[isOuter == 2 ? 'outer' : 'notOuter']"
+        >
+          外部考试
+        </button>
       </div>
       <a-form
-            ref="formRef"
-            name="custom-validation"
-            :model="formState"
-            :rules="rules"
-            v-bind="layout"
-            @finish="handleFinish"
-            @validate="handleValidate"
-            @finishFailed="handleFinishFailed"
-          >
-      <div class="contentMain">
-        <div class="main_left">
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="作业名称" name="examinationName">
-              <a-input
-                v-model:value="formState.examinationName"
-                style="width: 424px; height: 32px;margin-left: 35px;"
-                autocomplete="off"
-                placeholder="请输入考试名称"
-                maxlength="20"/>
+        ref="formRef"
+        name="custom-validation"
+        :model="formState"
+        :rules="rules"
+        v-bind="layout"
+        @finish="handleFinish"
+        @validate="handleValidate"
+        @finishFailed="handleFinishFailed"
+      >
+        <div class="contentMain">
+          <div class="main_left">
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item
+                  has-feedback
+                  label="作业名称"
+                  name="examinationName"
+                >
+                  <a-input
+                    v-model:value="formState.examinationName"
+                    style="width: 424px; height: 32px; margin-left: 35px"
+                    autocomplete="off"
+                    placeholder="请输入考试名称"
+                    maxlength="20"
+                  />
+                </a-form-item>
+              </div>
+            </div>
+            <div class="main_item2">
+              <a-form-item
+                has-feedback
+                label="考试说明"
+                name="examinationExplain"
+              >
+                <a-textarea
+                  v-model:value="formState.examinationExplain"
+                  placeholder="请输入考试说明"
+                  allow-clear
+                  style="margin-left: 35px"
+                  maxlength="150"
+                />
               </a-form-item>
             </div>
-          </div>
-          <div class="main_item2">
-            <a-form-item has-feedback label="考试说明" name="examinationExplain">
-              <a-textarea
-                v-model:value="formState.examinationExplain"
-                placeholder="请输入考试说明"
-                allow-clear
-                style="margin-left: 35px;"
-                maxlength="150"
-              />
-            </a-form-item>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="选择试卷" name="choosedTest">
-              <!-- <a-select
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="选择试卷" name="choosedTest">
+                  <!-- <a-select
                 dropdownClassName="dropdown-style"
                 placeholder="请输入考试名称"
                 :options="options1"
@@ -68,170 +86,237 @@
                 allowClear
                 showSearch
               /> -->
-              <a-dropdown >
-                <a-button   type="primary" style="width: 100px;margin-left: 35px;" class="outer" @click.prevent>
-                  选择试卷
-                  <DownOutlined />
-                </a-button>
-                <template #overlay>
-                  <a-menu>
-                    <a-menu-item v-for="item in formState.choosedTest" :key="item.key">
-                      <a @click="chooseTest(item.key-1)">{{item.value}}</a>
-                    </a-menu-item>
-                  </a-menu>
-                </template>
-              </a-dropdown>
-              <span style="margin-left: 10px">
-                <a-tag class="tag-style" 
-                v-for="item in choosedTestList" :closable="true"
-                @close="closeTag(item.key)"
-                 :key="item.key">{{item.value}}</a-tag>
-              </span>
-            </a-form-item>
- 
+                  <a-dropdown>
+                    <a-button
+                      type="primary"
+                      style="width: 100px; margin-left: 35px"
+                      class="outer"
+                      @click.prevent
+                    >
+                      选择试卷
+                      <DownOutlined />
+                    </a-button>
+                    <template #overlay>
+                      <a-menu>
+                        <a-menu-item
+                          v-for="item in formState.choosedTest"
+                          :key="item.key"
+                        >
+                          <a @click="chooseTest(item.key - 1)">{{
+                            item.value
+                          }}</a>
+                        </a-menu-item>
+                      </a-menu>
+                    </template>
+                  </a-dropdown>
+                  <span style="margin-left: 10px">
+                    <a-tag
+                      class="tag-style"
+                      v-for="item in choosedTestList"
+                      :closable="true"
+                      @close="closeTag(item.key)"
+                      :key="item.key"
+                      >{{ item.value }}</a-tag
+                    >
+                  </span>
+                </a-form-item>
+              </div>
             </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="考试时间" name="choosedTime">
-
-              <a-range-picker
-              v-model:value="formState.choosedTime"
-              format="YYYY-MM-DD"
-                style="width: 424px;margin-left: 35px;"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
-            </a-form-item>
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="考试时间" name="choosedTime">
+                  <a-range-picker
+                    v-model:value="formState.choosedTime"
+                    format="YYYY-MM-DD"
+                    style="width: 424px; margin-left: 35px"
+                    :placeholder="['      开始时间', '        结束时间']"
+                  />
+                </a-form-item>
+              </div>
             </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="考试时长" name="examinationDuration">
-
-              <a-input
-                v-model:value="formState.examinationDuration"
-                type="number"
-                style="width: 388px; height: 32px;
-                margin-left: 35px;"
-              />
-              
-            </a-form-item>
-            <span style="transform: translateY(-50%)">分钟</span>
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <span style="margin-right: 43px">考试限制</span>
-              <a-form-item has-feedback label="允许重复考试" name="examinationLimit">
-
-              <a-input-number
-                :min="-1" :precision="0"
-                type="number"
-                v-model:value="formState.examinationLimit"
-                style="width: 88px; height: 32px;
-                border-radius: 8px;overflow: hidden;"
-              />
-              <span style="margin-left: 8px">次</span>
-              <span style="margin-left: 24px; color: #999999"
-                >-1表示无限制</span>
-            </a-form-item>
-              
-              
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="显示答案" name="showAnswers">
-
-              <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.showAnswers">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看</a-radio>
-                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
-                  >不允许查看</a-radio
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item
+                  has-feedback
+                  label="考试时长"
+                  name="examinationDuration"
                 >
-              </a-radio-group>
-            </a-form-item>
-
+                  <a-input
+                    v-model:value="formState.examinationDuration"
+                    type="number"
+                    style="width: 388px; height: 32px; margin-left: 35px"
+                  />
+                </a-form-item>
+                <span style="transform: translateY(-50%)">分钟</span>
+              </div>
             </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="显示解析" name="showAnalysis">
-
-              <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.showAnalysis">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看</a-radio>
-                <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
-                  >不允许查看</a-radio
+            <div class="main_item">
+              <div class="btnbox">
+                <span style="margin-right: 43px">考试限制</span>
+                <a-form-item
+                  has-feedback
+                  label="允许重复考试"
+                  name="examinationLimit"
                 >
-              </a-radio-group>
-            </a-form-item>
-
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="评分模式" name="scoringModel">
-
-                <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.scoringModel">
-                  <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
-                    >最高一次</a-radio
+                  <a-input-number
+                    :min="-1"
+                    :precision="0"
+                    type="number"
+                    v-model:value="formState.examinationLimit"
+                    style="
+                      width: 88px;
+                      height: 32px;
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
+                  />
+                  <span style="margin-left: 8px">次</span>
+                  <span style="margin-left: 24px; color: #999999"
+                    >-1表示无限制</span
                   >
-                  <a-radio v-model:checked="checked" :value="2" @click="cloradio3"
-                    >最后一次</a-radio
+                </a-form-item>
+              </div>
+            </div>
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="显示答案" name="showAnswers">
+                  <a-radio-group
+                    style="margin-left: 35px; margin-right: 12px"
+                    v-model:value="formState.showAnswers"
                   >
-                </a-radio-group>
-              </a-form-item>
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="1"
+                      @click="cloradio1"
+                      >允许查看</a-radio
+                    >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="2"
+                      @click="cloradio1"
+                      >不允许查看</a-radio
+                    >
+                  </a-radio-group>
+                </a-form-item>
+              </div>
             </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="及格线" name="passLine">
-
-              <a-input
-                v-model:value="formState.passLine"
-                type="number"
-                style="width: 88px; height: 32px;margin-left: 35px;"
-              />
-            </a-form-item>
-
-              <span style="margin-left: 8px">分</span>
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="显示解析" name="showAnalysis">
+                  <a-radio-group
+                    style="margin-left: 35px; margin-right: 12px"
+                    v-model:value="formState.showAnalysis"
+                  >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="1"
+                      @click="cloradio2"
+                      >允许查看</a-radio
+                    >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="2"
+                      @click="cloradio2"
+                      >不允许查看</a-radio
+                    >
+                  </a-radio-group>
+                </a-form-item>
+              </div>
             </div>
-          </div>
-          <div class="main_item">
-            <div class="btnbox">
-              <a-form-item has-feedback label="作业要求" name="questionArrangement">
-
-              <a-radio-group
-              style="margin-right:12px;"
-              v-model:value="formState.questionArrangement">
-                <a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序</a-radio>
-                <a-radio v-model:checked="checked" :value="2" @click="cloradio4">试题排序</a-radio>
-                <a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序</a-radio>
-              </a-radio-group>
-            </a-form-item>
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="评分模式" name="scoringModel">
+                  <a-radio-group
+                    style="margin-left: 35px; margin-right: 12px"
+                    v-model:value="formState.scoringModel"
+                  >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="1"
+                      @click="cloradio3"
+                      >最高一次</a-radio
+                    >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="2"
+                      @click="cloradio3"
+                      >最后一次</a-radio
+                    >
+                  </a-radio-group>
+                </a-form-item>
+              </div>
+            </div>
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="及格线" name="passLine">
+                  <a-input
+                    v-model:value="formState.passLine"
+                    type="number"
+                    style="width: 88px; height: 32px; margin-left: 35px"
+                  />
+                </a-form-item>
 
+                <span style="margin-left: 8px">分</span>
+              </div>
+            </div>
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item
+                  has-feedback
+                  label="作业要求"
+                  name="questionArrangement"
+                >
+                  <a-radio-group
+                    style="margin-right: 12px"
+                    v-model:value="formState.questionArrangement"
+                  >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="1"
+                      @click="cloradio4"
+                      >试题乱序</a-radio
+                    >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="2"
+                      @click="cloradio4"
+                      >试题排序</a-radio
+                    >
+                    <a-radio
+                      v-model:checked="checked"
+                      :value="3"
+                      @click="cloradio4"
+                      >全部乱序</a-radio
+                    >
+                  </a-radio-group>
+                </a-form-item>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="main_btns">
-        <a-button class="btn1" @click="closeDrawer">取消</a-button>
-        <a-button class="btn2" html-type="submit" >确定</a-button>
-      </div>
-    </a-form>
+        <div class="main_btns">
+          <a-button class="btn1" @click="closeDrawer">取消</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button>
+        </div>
+      </a-form>
     </div>
     <!--  加载动画 -->
-    <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
-        <a-spin :spinning="addLoading" tip="添加中..." />
-      </div>
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="添加中..." />
+    </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, ref, toRefs } from "vue";
-import {message} from"ant-design-vue";
-import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
-import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"
+import { message } from "ant-design-vue";
+import {
+  createExamination,
+  queryExaminationDetailById,
+  updateExamination,
+} from "@/api/indexExam";
+import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 
-import  dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 export default {
   name: "AddTest",
@@ -242,7 +327,8 @@ export default {
       type: Boolean,
       default: false,
     },
-    EditTestId: { // 要编辑的考试id
+    EditTestId: {
+      // 要编辑的考试id
       type: Number,
       default: -1,
     },
@@ -266,181 +352,207 @@ export default {
       type: Number,
       default: null,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Number,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
-    edit: { //
+    edit: {
+      //
       type: Boolean,
       default: null,
     },
   },
   setup(props, ctx) {
     const formState = reactive({
-      examinationName:'',
-      examinationDuration:"",
-      examinationLimit:"",
-      passLine:60,
-      examinationEndTime:"",
-      examinationExplain:"",
-      questionArrangement:1,
-      scoringModel:2,
-      showAnalysis:2,
-      showAnswers:2,
-      choosedTime:'',
-      choosedTest:[
+      examinationName: "",
+      examinationDuration: "",
+      examinationLimit: "",
+      passLine: 60,
+      examinationEndTime: "",
+      examinationExplain: "",
+      questionArrangement: 1,
+      scoringModel: 2,
+      showAnalysis: 2,
+      showAnswers: 2,
+      choosedTime: "",
+      choosedTest: [
         {
-          key:1,
-          value:'提高核心竞争力'
+          key: 1,
+          value: "提高核心竞争力",
         },
         {
-          key:2,
-          value:'增强创新意识感'
+          key: 2,
+          value: "增强创新意识感",
         },
         {
-          key:3,
-          value:'巩固基础求发展'
+          key: 3,
+          value: "巩固基础求发展",
         },
       ],
-      
     });
     const state = reactive({
       addLoading: false,
-      isOuter:1, // 是否为外部考试
-      choosedTestList:[{
-        value:'提高核心竞争力',
-        key:1,
-      }],
-    })
+      isOuter: 1, // 是否为外部考试
+      choosedTestList: [
+        {
+          value: "提高核心竞争力",
+          key: 1,
+        },
+      ],
+    });
     const formRef = ref();
     let checkExaminationName = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入考试名称');
+        return Promise.reject("请输入考试名称");
       }
     };
     let checkExaminationExplain = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入考试说明');
+        return Promise.reject("请输入考试说明");
       }
     };
     let checkChoosedTest = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请选择考试');
+        return Promise.reject("请选择考试");
       }
     };
     let checkChoosedTime = async (_rule, value) => {
       if (!value.length) {
-        return Promise.reject('请选择时间');
+        return Promise.reject("请选择时间");
       }
     };
     let checkExaminationDuration = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入考试时长');
+        return Promise.reject("请输入考试时长");
       }
     };
     let checkLimit = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入考试限制');
+        return Promise.reject("请输入考试限制");
       }
     };
     let checkShowAnswers = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
     let checkShowAnalysis = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
     let checkScoringModel = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
     let checkPassLine = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入及格线');
+        return Promise.reject("请输入及格线");
       }
     };
     let checkQuestionArrangement = async (_rule, value) => {
       if (!value) {
-        return Promise.reject('请输入作业名称');
+        return Promise.reject("请输入作业名称");
       }
     };
     const rules = {
-      examinationName: [{
-        required: true,
-        validator: checkExaminationName,
-        trigger: 'change',
-      }],
-      examinationExplain: [{
-        validator: checkExaminationExplain,
-        trigger: 'change',
-      }],
-      choosedTest: [{
-        required: true,
-        validator: checkChoosedTest,
-        trigger: 'change',
-      }],
-      choosedTime: [{
-        required: true,
-        validator: checkChoosedTime,
-        trigger: 'change',
-      }],
-      examinationDuration: [{
-        required: true,
-        validator: checkExaminationDuration,
-        trigger: 'change',
-      }],
-      limit: [{
-        required: true,
-        validator: checkLimit,
-        trigger: 'change',
-      }],
-      showAnswers: [{
-        validator: checkShowAnswers,
-        trigger: 'change',
-      }],
-      showAnalysis: [{
-        validator: checkShowAnalysis,
-        trigger: 'change',
-      }],
-      scoringModel: [{
-        validator: checkScoringModel,
-        trigger: 'change',
-      }],
-      passLine: [{
-        required: true,
-        validator: checkPassLine,
-        trigger: 'change',
-      }],
-      questionArrangement: [{
-        validator: checkQuestionArrangement,
-        trigger: 'change',
-      }],
+      examinationName: [
+        {
+          required: true,
+          validator: checkExaminationName,
+          trigger: "change",
+        },
+      ],
+      examinationExplain: [
+        {
+          validator: checkExaminationExplain,
+          trigger: "change",
+        },
+      ],
+      choosedTest: [
+        {
+          required: true,
+          validator: checkChoosedTest,
+          trigger: "change",
+        },
+      ],
+      choosedTime: [
+        {
+          required: true,
+          validator: checkChoosedTime,
+          trigger: "change",
+        },
+      ],
+      examinationDuration: [
+        {
+          required: true,
+          validator: checkExaminationDuration,
+          trigger: "change",
+        },
+      ],
+      limit: [
+        {
+          required: true,
+          validator: checkLimit,
+          trigger: "change",
+        },
+      ],
+      showAnswers: [
+        {
+          validator: checkShowAnswers,
+          trigger: "change",
+        },
+      ],
+      showAnalysis: [
+        {
+          validator: checkShowAnalysis,
+          trigger: "change",
+        },
+      ],
+      scoringModel: [
+        {
+          validator: checkScoringModel,
+          trigger: "change",
+        },
+      ],
+      passLine: [
+        {
+          required: true,
+          validator: checkPassLine,
+          trigger: "change",
+        },
+      ],
+      questionArrangement: [
+        {
+          validator: checkQuestionArrangement,
+          trigger: "change",
+        },
+      ],
     };
 
     const options1 = ref([
       {
-        label:'math',
-        value:'math',
+        label: "math",
+        value: "math",
       },
       {
-        label:'eng',
-        value:'eng',
+        label: "eng",
+        value: "eng",
       },
-    ])
-    const handleFinish = values => {
+    ]);
+    const handleFinish = (values) => {
       console.log(values);
       updateTest();
     };
 
-    const handleFinishFailed = errors => {
+    const handleFinishFailed = (errors) => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
@@ -454,154 +566,186 @@ export default {
     };
     const closeDrawer = () => {
       resetForm();
-      formState.choosedTime = '';
+      formState.choosedTime = "";
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
+      // ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       console.log(props.edit);
-      if (props.addtestVisible && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求, 
-        queryTest()
+      if (props.addtestVisible && props.edit) {
+        // 该页面显示同时 edit为true 时，发送查询请求,
+        queryTest();
       }
       console.log("formState", bool);
     };
     const queryTest = () => {
       state.addLoading = true;
       console.log(props.EditTestId);
-      queryExaminationDetailById({examinationId:props.EditTestId}).then((res) => {
-        formState.examinationName = res.data.data.examinationName;
-        formState.workRequirement = res.data.data.workRequirement;
-        formState.examinationDuration = res.data.data.examinationDuration;
-        formState.examinationLimit = Number(res.data.data.examinationLimit) || -1;
-        formState.passLine = res.data.data.passLine;
-        formState.examinationExplain = res.data.data.examinationExplain;
-        formState.questionArrangement = Number(res.data.data.questionArrangement) || 1;
-        formState.scoringModel = Number(res.data.data.scoringModel) || 1;
-        formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
-        formState.showAnswers = Number(res.data.data.showAnswers )|| 1;
-        if(res.data.data.examinationEndTime && res.data.data.examinationStartTime){
-          formState.choosedTime= [dayjs(res.data.data.examinationStartTime,"YYYY-MM-DD"),dayjs(res.data.data.examinationEndTime,"YYYY-MM-DD")]
-          state.addLoading = false;
-        } else { formState.choosedTime=[] }
-        console.log(res);
-      }).catch(() => {
-        message.error(`查询失败`)
-      })
-    }
+      queryExaminationDetailById({ examinationId: props.EditTestId })
+        .then((res) => {
+          formState.examinationName = res.data.data.examinationName;
+          formState.workRequirement = res.data.data.workRequirement;
+          formState.examinationDuration = res.data.data.examinationDuration;
+          formState.examinationLimit =
+            Number(res.data.data.examinationLimit) || -1;
+          formState.passLine = res.data.data.passLine;
+          formState.examinationExplain = res.data.data.examinationExplain;
+          formState.questionArrangement =
+            Number(res.data.data.questionArrangement) || 1;
+          formState.scoringModel = Number(res.data.data.scoringModel) || 1;
+          formState.showAnalysis = Number(res.data.data.showAnalysis) || 1;
+          formState.showAnswers = Number(res.data.data.showAnswers) || 1;
+          if (
+            res.data.data.examinationEndTime &&
+            res.data.data.examinationStartTime
+          ) {
+            formState.choosedTime = [
+              dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD"),
+              dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD"),
+            ];
+            state.addLoading = false;
+          } else {
+            formState.choosedTime = [];
+          }
+          console.log(res);
+        })
+        .catch(() => {
+          message.error(`查询失败`);
+        });
+    };
     const updateTest = () => {
       state.addLoading = true;
       let obj = {
-            "examinationDuration": formState.examinationDuration,
-            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": formState.examinationExplain,
-            "examinationId":  props.edit?props.EditTestId : 0,
-            "examinationLimit": formState.examinationLimit,
-            "examinationName": formState.examinationName,
-            "examinationPaperId": 0,
-            "examinationPaperName": formState.choosedTest,
-            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "passLine": formState.passLine,
-            "questionArrangement": formState.questionArrangement,
-            "scoringModel": formState.scoringModel,
-            "showAnalysis": formState.showAnalysis,
-            "showAnswers": formState.showAnswers,
-      }
-        if(props.edit) { // 编辑任务
-          updateExamination(obj)
-          .then((res)=>{
-          updateTask(res);
-          closeDrawer();
-          }).catch(()=>{
-            message.error(`编辑失败`)
+        examinationDuration: formState.examinationDuration,
+        examinationEndTime: dayjs(formState.choosedTime[1]).format(
+          "YYYY-MM-DD"
+        ),
+        examinationExplain: formState.examinationExplain,
+        examinationId: props.edit ? props.EditTestId : 0,
+        examinationLimit: formState.examinationLimit,
+        examinationName: formState.examinationName,
+        examinationPaperId: 0,
+        examinationPaperName: formState.choosedTest,
+        examinationStartTime: dayjs(formState.choosedTime[0]).format(
+          "YYYY-MM-DD"
+        ),
+        passLine: formState.passLine,
+        questionArrangement: formState.questionArrangement,
+        scoringModel: formState.scoringModel,
+        showAnalysis: formState.showAnalysis,
+        showAnswers: formState.showAnswers,
+      };
+      if (props.edit) {
+        // 编辑任务
+        updateExamination(obj)
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+          })
+          .catch(() => {
+            message.error(`编辑失败`);
           });
-        }else { // 创建任务
+      } else {
+        // 创建任务
         createExamination(obj)
-        .then((res)=>{
-          updateTask(res);
-          closeDrawer();
-        }).catch(()=>{
-          message.error(`编辑失败`)
-        });
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+          })
+          .catch(() => {
+            message.error(`编辑失败`);
+          });
       }
-    }
-    
+    };
+
     const updateTask = (res) => {
-      if(props.isLevel == 1){
+      if (props.isLevel == 1) {
         let editObj1 = {
-            "chapterId": props.isactive,
-            "courseId": res.data.data.examinationId,
-            "name": res.data.data.examinationName,
-            "routerId": props.routerId,
-            "routerTaskId":  props.routerTaskId || 0,
-            "type": 5
-          }
-          RouterEditTask(editObj1).then(res => {
+          chapterId: props.isactive,
+          courseId: res.data.data.examinationId,
+          name: res.data.data.examinationName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 5,
+        };
+        RouterEditTask(editObj1)
+          .then((res) => {
             console.log(` 编辑关卡成功的打印 ${res}`);
-            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             state.addLoading = false;
             closeDrawer();
-          }).catch(err => {
-            message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
+          })
+          .catch((err) => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
             console.log(` 编辑关卡失败的打印 ${err}`);
           });
-      }else if(props.isLevel ==2){
-          let editObj = {
-          "courseId": res.data.data.examinationId,
-          "duration": 0,
-          "name": res.data.data.examinationName,
-          "projectId": props.projectId,
-          "projectTaskId": props.projectTaskId || 0,
-          "stageId": props.chooseStageId,
-          "type": 5
-        }
+      } else if (props.isLevel == 2) {
+        let editObj = {
+          courseId: res.data.data.examinationId,
+          duration: 0,
+          name: res.data.data.examinationName,
+          projectId: props.projectId,
+          projectTaskId: props.projectTaskId || 0,
+          stageId: props.chooseStageId,
+          type: 5,
+        };
         // 新增编辑或新增项目
-        ProjectEditTask(editObj).then(() => {
-          message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
-          ctx.emit("changeData", false);
-        }).catch(() => {
-          message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
-        });
-      }else if(props.isLevel ==3){
+        ProjectEditTask(editObj)
+          .then(() => {
+            message.success(
+              `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`
+            );
+            ctx.emit("changeData", false);
+          })
+          .catch(() => {
+            message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
+          });
+      } else if (props.isLevel == 3) {
         console.log("");
       }
-      
-    }
+    };
 
     const cloradio1 = (value) => {
       if (value != "") {
         formState.showAnswers = "";
       }
-    }
+    };
     const cloradio2 = (value) => {
       if (value != "") {
         formState.showAnalysis = "";
       }
-    }
+    };
     const cloradio3 = (value) => {
       if (value != "") {
         formState.scoringModel = "";
       }
-    }
+    };
     const cloradio4 = (value) => {
       if (value != "") {
         formState.questionArrangement = "";
       }
-    }
+    };
     const changeOuter = (value) => {
-      console.log(value)
-      state.isOuter = value
-    }
+      console.log(value);
+      state.isOuter = value;
+    };
     const chooseTest = (index) => {
-      for(let i in state.choosedTestList ) {
-        if(state.choosedTestList[i].key == formState.choosedTest[index].key) return;
+      for (let i in state.choosedTestList) {
+        if (state.choosedTestList[i].key == formState.choosedTest[index].key)
+          return;
       }
-      state.choosedTestList.push(formState.choosedTest[index])
-    }
+      state.choosedTestList.push(formState.choosedTest[index]);
+    };
     const closeTag = (removedTag) => {
-      const tags = state.choosedTestList.filter(item => item.key != removedTag);
+      const tags = state.choosedTestList.filter(
+        (item) => item.key != removedTag
+      );
       state.choosedTestList = tags;
-    }
+    };
     return {
       formState,
       afterVisibleChange,
@@ -623,7 +767,7 @@ export default {
       changeOuter,
       chooseTest,
       closeTag,
-      ...toRefs(state)
+      ...toRefs(state),
     };
   },
 };
@@ -636,21 +780,21 @@ export default {
   background-color: #4ea6ff;
   color: #fff;
   border-radius: 5px;
-  border:1px solid #a09292;
+  border: 1px solid #a09292;
   height: 36px;
   margin-right: 10px;
 }
 .notOuter {
   color: #000;
   border-radius: 5px;
-  border:1px solid #a09292;
-  background:#fff;
+  border: 1px solid #a09292;
+  background: #fff;
   margin-right: 10px;
-  padding:3px;
+  padding: 3px;
 }
 .tag-style {
-  color:rgb(113, 113, 237);
-  background-color:#d7d1f7;
+  color: rgb(113, 113, 237);
+  background-color: #d7d1f7;
 }
 .addtestDrawer {
   .drawerMain {
diff --git a/src/components/drawers/AddVote1.vue b/src/components/drawers/AddVote1.vue
index 1521159a..ffdee490 100644
--- a/src/components/drawers/AddVote1.vue
+++ b/src/components/drawers/AddVote1.vue
@@ -135,17 +135,17 @@
       </div>
     </div>
   </a-drawer>
-    <a-drawer
-      v-model:visible="voteDrawerShow"
-      class="custom-class"
-      title="创建投票"
-      placement="right"
-      @after-visible-change="afterVoteVisibleChange"
-    >
-      <p>Some contents...</p>
-      <p>Some contents...</p>
-      <p>Some contents...</p>
-    </a-drawer>
+  <a-drawer
+    v-model:visible="voteDrawerShow"
+    class="custom-class"
+    title="创建投票"
+    placement="right"
+    @after-visible-change="afterVoteVisibleChange"
+  >
+    <p>Some contents...</p>
+    <p>Some contents...</p>
+    <p>Some contents...</p>
+  </a-drawer>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -159,10 +159,13 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      voteDrawerShow:false,
+      voteDrawerShow: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
+      ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
 
     const afterVisibleChange = (bool) => {
@@ -175,10 +178,8 @@ export default {
 
     const showVoteDrawer = () => {
       state.voteDrawerShow = true;
-    }
-    const afterVoteVisibleChange = () => {
-
     };
+    const afterVoteVisibleChange = () => {};
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -186,7 +187,7 @@ export default {
       closeDrawer,
       // change,
       showVoteDrawer,
-      afterVoteVisibleChange
+      afterVoteVisibleChange,
     };
   },
 };
diff --git a/src/components/drawers/AddVotebak.vue b/src/components/drawers/AddVotebak.vue
index 5280a5b1..49da2ff7 100644
--- a/src/components/drawers/AddVotebak.vue
+++ b/src/components/drawers/AddVotebak.vue
@@ -65,7 +65,7 @@
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{ballotName}}</span>
+                  <span style="color: #388be1">{{ ballotName }}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -128,7 +128,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import CreVote from "./CreVote.vue";
 import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
@@ -136,7 +136,6 @@ import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import * as apiTask from "../../api/indexTaskadd";
 
-
 export default {
   name: "AddVote",
   components: {
@@ -167,11 +166,13 @@ export default {
       type: Number,
       default: 0,
     },
-    isLevel: { // 是否是关卡页面触发
+    isLevel: {
+      // 是否是关卡页面触发
       type: Boolean,
       default: null,
     },
-    projectTaskId: { // 要编辑的projectId 
+    projectTaskId: {
+      // 要编辑的projectId
       type: Number,
       default: null,
     },
@@ -182,9 +183,7 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
-
-
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -192,37 +191,40 @@ export default {
       textV1: "",
       crevotevisible: false,
       time: undefined,
-      startTime:"",
-      endTime:"",
+      startTime: "",
+      endTime: "",
       basevote: "",
       ascriptionId: "",
       voteStemId: null,
-      voteId:"",
-      voteStemName:"",
+      voteId: "",
+      voteStemName: "",
       ballotName: "",
-      editStem: false,  //编辑状态
+      editStem: false, //编辑状态
       ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
     });
     const closeDrawer = () => {
-        state.inputV1 = "",
-        state.textV1 = "",
-        state.time = undefined,
-        state.basevote = "",
-      ctx.emit("update:addvoteVisible", false);
+      (state.inputV1 = ""),
+        (state.textV1 = ""),
+        (state.time = undefined),
+        (state.basevote = ""),
+        ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
+      ctx.emit("changeData", false);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-        queryVoteInfo();
+      queryVoteInfo();
     };
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
     };
     const getStemId = (data) => {
       state.ballotName = data.ballotName;
-      state.ballotId =data.ballotId;
-    }
+      state.ballotId = data.ballotId;
+    };
 
     const delBox = () => {
       state.creVote = false;
@@ -231,19 +233,18 @@ export default {
     //删除题干信息接口
     const dleVoteStem = () => {
       let objdelstem = {
-        voteStemId:state.voteStemId
-      }
-      api.deleteVoteStem(objdelstem)
-        .then((res) => {
-          console.log('删除题干信息成功', res)
-          message.success('删除题干信息成功')
-          delBox()
-      })
-    }
+        voteStemId: state.voteStemId,
+      };
+      api.deleteVoteStem(objdelstem).then((res) => {
+        console.log("删除题干信息成功", res);
+        message.success("删除题干信息成功");
+        delBox();
+      });
+    };
 
     //根据投票id获取投票信息
-     const queryVoteInfo = ()=>{
-    /** 
+    const queryVoteInfo = () => {
+      /** 
        let obj = {
         voteId:props.voteId
       }
@@ -261,10 +262,9 @@ export default {
          console.log('获取投票信息失败',err);
        })
        **/
-      
-     }
-     const updateToTask =(res)=>{
-      if(props.isLevel){
+    };
+    const updateToTask = (res) => {
+      if (props.isLevel) {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.voteId,
@@ -275,17 +275,17 @@ export default {
         })
           .then((res) => {
             console.log(res, 11111);
-            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
-            state.addLoading = false;               
+            state.addLoading = false;
           })
           .catch((err) => {
             console.log(err, 1111);
           });
-      }else{
+      } else {
         apiTask
           .addTask({
-            courseId:res.data.data.voteId,
+            courseId: res.data.data.voteId,
             name: res.data.data.voteName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
@@ -294,13 +294,13 @@ export default {
           })
           .then((res) => {
             console.log("调用项目添加接口后111", res.data, 11111);
-            ctx.emit("changeData", false);   
+            ctx.emit("changeData", false);
           })
           .catch((err) => {
             console.log(err, 111111);
           });
       }
-    }
+    };
     //修改投票信息接口
     const updateVoteInfo = () => {
       if (!state.inputV1) {
@@ -311,48 +311,47 @@ export default {
       if (state.basevote == "") {
         state.basevote = 1;
       }
-      if(state.time != undefined){
+      if (state.time != undefined) {
         state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
         state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
       let obj = {
-        voteId: props.edit?state.voteId : 0,
+        voteId: props.edit ? state.voteId : 0,
         voteName: state.inputV1,
         voteStartTime: state.startTime,
         voteEndTime: state.endTime,
         ballotId: state.ballotId,
         baseVote: state.basevote,
-        voteExplain: state.textV1, 
-        createUser:0,
-        updateUser:0,
-        voteTag:"",
-      }
-      if(props.edit){
+        voteExplain: state.textV1,
+        createUser: 0,
+        updateUser: 0,
+        voteTag: "",
+      };
+      if (props.edit) {
         api
-        .editVote(obj)
-        .then((res) => {
-          updateToTask(res);
-          closeDrawer();
-          console.log('修改投票信息成功', res);
-        })
-        .catch((err) => {
-          console.log('修改投票信息失败', err);
-        })
-      }else{
+          .editVote(obj)
+          .then((res) => {
+            updateToTask(res);
+            closeDrawer();
+            console.log("修改投票信息成功", res);
+          })
+          .catch((err) => {
+            console.log("修改投票信息失败", err);
+          });
+      } else {
         api
-        .createVote(obj)
-        .then((res) => {
-          updateToTask(res);
-          closeDrawer();
-          console.log('创建投票信息成功', res);
-        })
-        .catch((err) => {
-          console.log('创建投票信息失败', err);
-        })
+          .createVote(obj)
+          .then((res) => {
+            updateToTask(res);
+            closeDrawer();
+            console.log("创建投票信息成功", res);
+          })
+          .catch((err) => {
+            console.log("创建投票信息失败", err);
+          });
       }
-      
-    }
+    };
     return {
       ...toRefs(state),
       showDrawerCreVote,
@@ -363,7 +362,6 @@ export default {
       dleVoteStem,
       updateVoteInfo,
       delBox,
-      
     };
   },
 };

From 7ba791b51c521e644ca27970db23174b065a323f Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Thu, 17 Nov 2022 18:47:54 +0800
Subject: [PATCH 62/90] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=88=E4=BD=9C=E4=B8=9A=E5=9C=A8=E7=BA=BF=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E6=8A=95=E7=A5=A8=E6=B5=8B=E8=AF=84=E7=AE=A1=E7=90=86=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E6=B4=BB=E5=8A=A8=E8=80=83=E5=8B=A4=20feat=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E4=BD=9C=E4=B8=9A=20?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=88=90=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue |  95 ++----
 src/components/drawers/CheckVote.vue        | 155 +++++++++
 src/components/drawers/CheckWork.vue        | 154 +++++++++
 src/components/drawers/ExportHWork.vue      | 243 +++++++++++++
 src/components/drawers/ExportScore.vue      | 356 ++++++++++++++++++++
 src/components/drawers/FaceManage.vue       |  56 ++-
 src/components/drawers/FaceStu.vue          |  63 +---
 src/components/drawers/SignQR.vue           | 171 ++++++++++
 src/components/drawers/TestManage.vue       | 260 +++++++++-----
 src/components/drawers/TimeManage.vue       | 225 ++++++++++---
 src/components/drawers/WorkManage.vue       | 336 +++++-------------
 src/views/learningpath/LevelAddDetail.vue   |  58 +---
 src/views/projectcenter/TaskPage.vue        |  27 +-
 vue.config.js                               |   3 +-
 14 files changed, 1636 insertions(+), 566 deletions(-)
 create mode 100644 src/components/drawers/CheckVote.vue
 create mode 100644 src/components/drawers/CheckWork.vue
 create mode 100644 src/components/drawers/ExportHWork.vue
 create mode 100644 src/components/drawers/ExportScore.vue
 create mode 100644 src/components/drawers/SignQR.vue

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 51b8fb33..b7ec2d8b 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ title }}</div>
+        <div class="headerTitle">【{{ title }}】考勤</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -76,12 +76,12 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
+          <div class="btn btn1"  @click="signQR">
+            <div class="wz">签到二维码</div>
+          </div>
           <div class="btn btn2" @click="showqdModal">
             <div class="wz">批量签到</div>
           </div>
-          <div class="btn btn2" @click="showqtModal">
-            <div class="wz">批量签退</div>
-          </div>
           <div class="btn btn1">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -173,36 +173,7 @@
       </div>
     </div>
   </a-modal>
-  <!-- 批量签退弹窗 -->
-  <a-modal
-    v-model:visible="qtModal"
-    :footer="null"
-    :closable="closeCopy"
-    wrapClassName="CopyModal"
-    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="closeqtModal"></div>
-        </div>
-        <div class="body">
-          <span>您确定要批量签退吗</span>
-        </div>
-        <div class="del_btnbox">
-          <div class="del_btn btn1">
-            <div class="btnText" @click="delete_exit">取消</div>
-          </div>
-          <div class="del_btn btn2">
-            <div class="btnText" @click="delete_exit">确定</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </a-modal>
+
   <!-- 单独签到弹窗 -->
   <a-modal
     v-model:visible="singleqdModal"
@@ -293,12 +264,18 @@
       </div>
     </div>
   </a-modal>
+  <!-- 二维码签到弹窗 -->
+  <SignQR v-model:signQRvisible="signQRvisible"/>
 </template>
 
 <script>
 import { toRefs, reactive } from "vue";
+import SignQR from "./SignQR.vue"
 export default {
   name: "ActiveAttendance",
+  components: { 
+    SignQR,
+ },
   props: {
     AAvisible: {
       type: Boolean,
@@ -320,7 +297,7 @@ export default {
       currentPage: 1,
       tableDataTotal: 100,
       selectedRowKeys: [],
-      qtModal: false, //批量签退
+      signQRvisible:false, //二维码弹窗
       qdModal: false, //批量签到
       singleqjModal: false, //单独请假
       singleqdModal: false, //单独签到
@@ -449,31 +426,6 @@ export default {
           signOut: true, //签退
           leave: false, //请假
         },
-        {
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "2022-10-31  23:12",
-          jin: "2022-10-31  23:12",
-          time: "签到/签退",
-          state: "正常",
-          signIn: true, //签到
-          signOut: true, //签退
-          leave: false, //请假
-        },
-        {
-          key: 8,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "2022-10-31  23:12",
-          jin: "2022-10-31  23:12",
-          time: "请假",
-          state: "正常",
-          signIn: false, //签到
-          signOut: false, //签退
-          leave: true, //请假
-        },
       ],
       options: [
         {
@@ -551,13 +503,21 @@ export default {
 
     const tableDataFunc = () => {
       const columns = [
+      {
+          title: "工号",
+          dataIndex: "workNum",
+          key: "workNum",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
         {
           title: "姓名",
           dataIndex: "name",
           // width: "30%",
           key: "name",
           width: 50,
-          align: "left",
+          align: "center",
           className: "classify",
           scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
@@ -640,15 +600,9 @@ export default {
     const showqdModal = () => {
       state.qdModal = true;
     };
-    const showqtModal = () => {
-      state.qtModal = true;
-    };
     const closeqdModal = () => {
       state.qdModal = false;
     };
-    const closeqtModal = () => {
-      state.qtModal = false;
-    };
     const showsingleqdModal = () => {
       state.singleqdModal = true;
     };
@@ -667,6 +621,9 @@ export default {
     const closesingleqjModal = () => {
       state.singleqjModal = false;
     };
+    const signQR = ()=> {
+      state.signQRvisible = true
+    }
     return {
       ...toRefs(state),
       selectProjectName,
@@ -676,8 +633,6 @@ export default {
       showEntryScore,
       tableDataFunc,
       showqdModal,
-      showqtModal,
-      closeqtModal,
       closeqdModal,
       showsingleqdModal,
       showsingleqtModal,
@@ -685,6 +640,7 @@ export default {
       closesingleqdModal,
       closesingleqtModal,
       closesingleqjModal,
+      signQR,
     };
   },
 };
@@ -737,6 +693,7 @@ export default {
           flex: 1;
           overflow-y: auto;
           margin-bottom: 75px;
+          padding-right: 10px;
           .titl {
             display: flex;
             .endtime {
diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue
new file mode 100644
index 00000000..527ff43c
--- /dev/null
+++ b/src/components/drawers/CheckVote.vue
@@ -0,0 +1,155 @@
+<template>
+    <a-drawer
+    :visible="CVvisible"
+    class="drawerStyle CheckWork"
+    placement="right"
+    width="40%"
+    @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 class="suptit"><span>评估名称：<span>管理者进阶投票</span></span></div> -->
+            </div>
+            <div class="main">
+                <div class="basetext"><span>基础信息</span></div>
+                <div class="HW Name"><span>作业名称：</span ><span style="color:#999ba3">{{"管理者进阶作业"}}</span></div>
+                <div class="HW Need"><span>作业要求：</span ><span style="color:#999ba3">{{"写一篇观后感，字数600字"}}</span></div>
+                <div class="HWText">
+                    <span>作业信息：</span>
+                    <div class="hwText">
+                        <img src="@/assets/images/projectadd/keep.png"/>
+                        <div class="hwName">{{"京东方商业模型.jpeg"}}</div>
+                        <div class="op"> <span>查看</span> </div>
+                        <div class="op"> <span>下载</span> </div>
+                    </div>
+                </div>
+            </div>
+            <div class="btnn">
+                <button class="btn1">取消</button>
+                <button class="btn2">确定</button>
+            </div>
+        </div>
+    </a-drawer>
+</template>
+
+<script>
+import { toRefs,reactive } from '@vue/reactivity';
+export default {
+    name:"CheckWork",
+    props:{
+        CVvisible:{
+            type:Boolean,
+            default:false,
+        },
+    },
+    setup(props,ctx){
+        const state = reactive({
+
+        })
+        const closeDrawer = ()=> {
+            ctx.emit("update:CVvisible",false)
+        }
+        const afterVisibleChange = (bool) => {
+            console.log(bool);
+        }
+        return{
+            ...toRefs(state),
+            closeDrawer,
+            afterVisibleChange,
+        }
+    }
+};
+</script>
+<style lang="scss">
+.CheckWork {
+    .drawerMain {
+        min-width: 400px;
+        margin: 0px 32px 0px 32px;
+        display: flex;
+        flex-direction: column;
+        .header {
+            height: 73px;
+            border-bottom: 1px solid #e8e8e8;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+            .headerTitle {
+                font-size: 18px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 25px;
+            }
+        }
+        .main {
+            width: 100%;
+            overflow-y: auto;
+            margin-bottom: 70px;
+            .basetext{
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 25px;
+                margin-bottom: 27px ;
+            }
+            .HW{
+                margin-bottom: 20px;
+            }
+            .hwText{
+                display: flex;
+                align-items: center;
+                margin: 15px auto;
+                img{
+                    background-size: 100% 100%;
+                }
+                .hwName{
+                    margin:auto 10px;
+                }
+                .op{
+                    color:#388be1;
+                    margin: auto 20px;
+                    cursor: pointer;
+                }
+            }
+        }
+
+        .btnn {
+            height: 72px;
+            width: 100%;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            background-color: #fff;
+            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/CheckWork.vue b/src/components/drawers/CheckWork.vue
new file mode 100644
index 00000000..1dcf08c7
--- /dev/null
+++ b/src/components/drawers/CheckWork.vue
@@ -0,0 +1,154 @@
+<template>
+    <a-drawer
+    :visible="CWvisible"
+    class="drawerStyle CheckWork"
+    placement="right"
+    width="40%"
+    @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="main">
+                <div class="basetext"><span>基础信息</span></div>
+                <div class="HW Name"><span>作业名称：</span ><span style="color:#999ba3">{{"管理者进阶作业"}}</span></div>
+                <div class="HW Need"><span>作业要求：</span ><span style="color:#999ba3">{{"写一篇观后感，字数600字"}}</span></div>
+                <div class="HWText">
+                    <span>作业信息：</span>
+                    <div class="hwText">
+                        <img src="@/assets/images/projectadd/keep.png"/>
+                        <div class="hwName">{{"京东方商业模型.jpeg"}}</div>
+                        <div class="op"> <span>查看</span> </div>
+                        <div class="op"> <span>下载</span> </div>
+                    </div>
+                </div>
+            </div>
+            <div class="btnn">
+                <button class="btn1">取消</button>
+                <button class="btn2">确定</button>
+            </div>
+        </div>
+    </a-drawer>
+</template>
+
+<script>
+import { toRefs,reactive } from '@vue/reactivity';
+export default {
+    name:"CheckWork",
+    props:{
+        CWvisible:{
+            type:Boolean,
+            default:false,
+        },
+    },
+    setup(props,ctx){
+        const state = reactive({
+
+        })
+        const closeDrawer = ()=> {
+            ctx.emit("update:CWvisible",false)
+        }
+        const afterVisibleChange = (bool) => {
+            console.log(bool);
+        }
+        return{
+            ...toRefs(state),
+            closeDrawer,
+            afterVisibleChange,
+        }
+    }
+};
+</script>
+<style lang="scss">
+.CheckWork {
+    .drawerMain {
+        min-width: 400px;
+        margin: 0px 32px 0px 32px;
+        display: flex;
+        flex-direction: column;
+        .header {
+            height: 73px;
+            border-bottom: 1px solid #e8e8e8;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+            .headerTitle {
+                font-size: 18px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 25px;
+            }
+        }
+        .main {
+            width: 100%;
+            overflow-y: auto;
+            margin-bottom: 70px;
+            .basetext{
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 25px;
+                margin-bottom: 27px ;
+            }
+            .HW{
+                margin-bottom: 20px;
+            }
+            .hwText{
+                display: flex;
+                align-items: center;
+                margin: 15px auto;
+                img{
+                    background-size: 100% 100%;
+                }
+                .hwName{
+                    margin:auto 10px;
+                }
+                .op{
+                    color:#388be1;
+                    margin: auto 20px;
+                    cursor: pointer;
+                }
+            }
+        }
+
+        .btnn {
+            height: 72px;
+            width: 100%;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            background-color: #fff;
+            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/ExportHWork.vue b/src/components/drawers/ExportHWork.vue
new file mode 100644
index 00000000..f3ca86f8
--- /dev/null
+++ b/src/components/drawers/ExportHWork.vue
@@ -0,0 +1,243 @@
+<template>
+      <a-modal
+        :visible="exportHWorkvisible"
+        :closable="close"
+        :footer="null"
+        wrapClassName="WorkManage"
+        centered="true"
+        @cancel="closeModal"
+      >
+        <div class="header">
+          <div class="inheader">
+            <div class="left">提示</div>
+            <div class="right" @click="closeModal"></div>
+          </div>
+        </div>
+        <div class="main">
+          <div class="check"></div>
+          <div class="text"><span>作业导出完成，请在下载本地或去下载中心查看</span></div>
+          <div class="btn">
+            <button class="btn1 sabtn" style="margin-right: 20px;">查看</button>
+            <button class="btn2 sabtn">下载</button>
+          </div>
+        </div>
+      </a-modal>
+</template>
+
+<script>
+import { reactive,toRefs } from '@vue/reactivity';
+export default {
+    name:"EHWork",
+    props: {
+        exportHWorkvisible:{
+            type:Boolean,
+            default:false,
+        }
+    },
+  setup(props,ctx){
+    const state = reactive({
+        close:false
+    })
+    const closeModal = ()=> {
+        ctx.emit('update:exportHWorkvisible',false)
+    }
+    return {
+        ...toRefs(state),
+        closeModal,
+    }
+  }
+};
+</script>
+<style lang="scss">
+.WorkManage {
+  .drawerMain {
+    min-width: 550px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      width: 100%;
+      height: 100%;
+      // margin-bottom: 30px;
+      // background-color: #bfa;
+      overflow-y: auto;
+      .endtime {
+        font-size: 16px;
+        font-weight: 500;
+        color: #333333;
+      }
+      .search {
+        width: 100%;
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 20px;
+        justify-content: space-between;
+
+        .sealeft {
+          display: flex;
+          flex-wrap: wrap;
+          .namecon {
+            display: flex;
+            flex-wrap: nowrap;
+            margin-bottom: 10px;
+            .name {
+              margin-top: 8px;
+              white-space: nowrap;
+            }
+          }
+        }
+        .btns {
+          display: flex;
+          flex-wrap: nowrap;
+
+          .btn {
+            cursor: pointer;
+            width: 100px;
+            height: 40px;
+            border-radius: 8px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .img1 {
+              width: 15px;
+              height: 17px;
+              background-image: url(../../assets/images/courseManage/search0.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+            .img2 {
+              width: 16px;
+              height: 18px;
+              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+          }
+
+          .btn1 {
+            background: #409eff;
+
+            color: #ffffff;
+          }
+          .btn2 {
+            background: #ffffff;
+
+            color: #388be1;
+            border: 1px solid #388be1;
+          }
+        }
+      }
+      .btnss {
+        display: flex;
+        flex-wrap: nowrap;
+
+        .btn {
+          cursor: pointer;
+          width: 130px;
+          height: 40px;
+          border-radius: 8px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          .img1 {
+            width: 17px;
+            height: 16px;
+            background-image: url(../../assets/images/coursewareManage/export1.png);
+            background-size: 100% 100%;
+            margin-right: 7px;
+          }
+        }
+
+        .btn1 {
+          background: #409eff;
+          color: #ffffff;
+        }
+        .btn2 {
+          background: #ffffff;
+          color: #388be1;
+          border: 1px solid #388be1;
+        }
+      }
+      .tab {
+        th.h {
+          background-color: #eff4fc !important;
+        }
+
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
+          background: #f6f9fd;
+        }
+        .tableBox {
+          .pa {
+            // left: 0;
+            margin-top: 15px;
+            width: 100%;
+            // height: 20px;
+            // background-color: red;
+            display: flex;
+            justify-content: center;
+            // position: absolute;
+            // bottom: 20px;
+            .ant-pagination-prev,
+            .ant-pagination-next,
+            .ant-pagination-item,
+            .ant-pagination-options {
+              margin-bottom: 10px;
+            }
+          }
+        }
+      }
+    }
+
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      background-color: #fff;
+      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: #409eff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue
new file mode 100644
index 00000000..b1c4f91e
--- /dev/null
+++ b/src/components/drawers/ExportScore.vue
@@ -0,0 +1,356 @@
+<template>
+    <a-drawer
+      :visible="eScorevisible"
+      class="drawerStyle ExportScore"
+      placement="right"
+      width="700px"
+      @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="main">
+          <div class="minatitl">
+            <div class="up1">请下载</div>
+            <div class="up2">模板</div>
+            <div class="up1">，按要求填写数据并导入</div>
+          </div>
+          <div class="upload">
+            <div class="text">上传：</div>
+            <div class="right">
+              <div class="load">
+                <div class="cloud"></div>
+                <div class="tip">点击或将文件拖拽到此处上传</div>
+                <div class="tipz">支持扩展名：.xls/.xlsx</div>
+              </div>
+              <div class="loadstate">
+                <div class="loadborder">
+                  <div class="content">
+                    <div class="img"></div>
+                    <div class="timebox">
+                      <div class="timetop">
+                        <div class="tit">京东方商业模型.xls</div>
+                        <div class="stateloading">正在上传</div>
+                      </div>
+                      <div class="prog">
+                        <div class="inprogloading"></div>
+                      </div>
+                    </div>
+                    <div class="curloading">
+                      <div class="cur">55%</div>
+                      <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div>
+                    </div>
+                  </div>
+                </div>
+                <div class="loadborder">
+                  <div class="content">
+                    <div class="img"></div>
+                    <div class="timebox">
+                      <div class="timetop">
+                        <div class="tit">京东方商业模型.xls</div>
+                        <div class="statedefeat">上传失败</div>
+                      </div>
+                      <div class="prog">
+                        <div class="inprogdefeat"></div>
+                      </div>
+                    </div>
+                    <div class="curloading">
+                      <div class="cur">55%</div>
+                      <div class="cancel" style="margin-left: 20px">暂停</div>
+                      <div class="cancel" style="margin-left: 15px">取消</div>
+                    </div>
+                    <div class="defeat">下载失败数据</div>
+                  </div>
+                </div>
+                <div class="loadborder">
+                  <div class="content">
+                    <div class="img"></div>
+                    <div class="timebox">
+                      <div class="timetop">
+                        <div class="tit">京东方商业模型.xls</div>
+                        <div class="statesucce">上传成功</div>
+                      </div>
+                      <div class="prog">
+                        <div class="inprogsucce"></div>
+                      </div>
+                    </div>
+                    <div class="curloading">
+                      <div class="cur">100%</div>
+                      <div class="cancel" style="margin-left: 20px">删除</div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="btnn">
+          <button class="btn1">取消</button>
+          <button class="btn2">确定</button>
+        </div>
+      </div>
+    </a-drawer>
+  </template>
+  
+  <script>
+  import { reactive, toRefs } from "vue";
+  export default {
+    name: "EScore",
+    props: {
+      eScorevisible: {
+        type: Boolean,
+        default: false,
+      },
+    },
+    setup(props, ctx) {
+      const state = reactive({});
+      const closeDrawer = () => {
+        ctx.emit("update:eScorevisible", false);
+      };
+  
+      const afterVisibleChange = (bool) => {
+        console.log("state", bool);
+      };
+  
+      return {
+        ...toRefs(state),
+        afterVisibleChange,
+        closeDrawer,
+      };
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .ExportScore {
+    .drawerMain {
+      min-width: 600px;
+      margin: 0px 32px 0px 32px;
+      overflow-x: auto;
+      display: flex;
+      flex-direction: column;
+      .header {
+        height: 73px;
+        border-bottom: 1px solid #e8e8e8;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        // background-color: red;
+        margin-bottom: 20px;
+        flex-shrink: 0;
+        .headerTitle {
+          font-size: 18px;
+          font-weight: 600;
+          color: #333333;
+          line-height: 25px;
+          // margin-left: 24px;
+        }
+      }
+      .main {
+        overflow-y: auto;
+        .minatitl {
+          display: flex;
+          .up1 {
+            font-size: 16px;
+            font-weight: 400;
+            color: #333333;
+          }
+          .up2 {
+            font-size: 16px;
+            font-weight: 400;
+            color: #388be1;
+            margin-left: 4px;
+          }
+        }
+        .upload {
+          margin-top: 32px;
+          display: flex;
+          .text {
+            font-size: 14px;
+            font-weight: 400;
+            color: #333333;
+          }
+          .right {
+            margin-left: 6px;
+            .load {
+              width: 500px;
+              height: 176px;
+              background: #f5f9fd;
+              border-radius: 4px;
+              // opacity: 0.3;
+              border: 1px dashed #caddfd;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              margin-bottom: 20px;
+              .cloud {
+                margin-top: 52px;
+                width: 28px;
+                height: 28px;
+                background-image: url(../../assets/images/basicinfo/cloud.png);
+              }
+              .tip {
+                font-size: 14px;
+                font-weight: 400;
+                color: #388be1;
+                margin-top: 15px;
+                cursor: pointer;
+              }
+              .tipz {
+                font-size: 14px;
+                font-weight: 400;
+                color: #999999;
+                margin-top: 10px;
+              }
+            }
+            .loadstate {
+              width: 500px;
+              margin-bottom: 100px;
+  
+              .loadborder {
+                width: 500px;
+                height: 173px;
+                border-radius: 4px;
+                border: 1px dashed #eaeaea;
+                margin-bottom: 30px;
+                display: flex;
+                align-items: center;
+                .content {
+                  display: flex;
+                  margin-left: 20px;
+                  position: relative;
+                  .defeat {
+                    position: absolute;
+                    left: 46px;
+                    top: 38px;
+                    font-size: 14px;
+                    font-weight: 500;
+                    color: #ff7474;
+                  }
+                  .img {
+                    width: 30px;
+                    height: 34px;
+                    background-image: url(../../assets/images/basicinfo/exl.png);
+                  }
+                  .timebox {
+                    margin-left: 15px;
+                    margin-top: -5px;
+                    .timetop {
+                      display: flex;
+                      width: 262px;
+                      justify-content: space-between;
+                      margin-bottom: 8px;
+                      .tit {
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #333333;
+                      }
+                      .stateloading {
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #388be1;
+                      }
+                      .statedefeat {
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #ff7474;
+                      }
+                      .statesucce {
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #35ae69;
+                      }
+                    }
+                    .prog {
+                      width: 262px;
+                      height: 5px;
+                      background: #eaf1fe;
+                      border-radius: 4px;
+                      .inprogloading {
+                        width: 55%;
+                        height: 5px;
+                        border-radius: 4px;
+  
+                        background: #388be1;
+                      }
+                      //下载失败条
+                      .inprogdefeat {
+                        width: 55%;
+                        height: 5px;
+                        border-radius: 4px;
+  
+                        background: #ff7474;
+                      }
+                      //下载成功条
+                      .inprogsucce {
+                        width: 100%;
+                        height: 5px;
+                        border-radius: 4px;
+  
+                        background: #57c887;
+                      }
+                    }
+                  }
+                  .curloading {
+                    margin-left: 15px;
+                    margin-top: 15px;
+                    display: flex;
+                    .cur {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #333333;
+                    }
+                    .cancel {
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #387df7;
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      .btnn {
+        height: 72px;
+        width: 100%;
+        position: absolute;
+        background-color: #fff;
+        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/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 317856a2..32bd2e00 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -117,10 +117,9 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
+        <button class="btn1" @click="ckwork()">取消</button>
         <button class="btn2">确定</button>
       </div>
-
       <a-modal
         :closable="closable"
         v-model:visible="showmodal"
@@ -151,15 +150,21 @@
   </a-drawer>
   <!-- 录入成绩抽屉 -->
   <entry-scores v-model:Evisible="Evisible" />
+  <!-- 查看作业抽屉 -->
+  <CKWork v-model:CWvisible="CWvisible"/>
 </template>
 
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import CKWork from './CheckWork.vue'
 import EntryScores from "./EntryScores.vue";
 import * as api from "../../api/index";
 export default {
   name: "FaceManage",
-  components: { EntryScores },
+  components: { 
+    EntryScores,
+    CKWork,
+   },
   props: {
     Fvisible: {
       type: Boolean,
@@ -178,6 +183,7 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       Evisible: false, //录入成绩抽屉
+      CWvisible: false, //查看作业抽屉
       name: "",
       showmodal: false, //勾选提示框
       closable: false, //modal右上角的关闭按钮
@@ -208,6 +214,14 @@ export default {
       ],
       tabledata: [],
       tablecolumns: [
+        {
+          title: "工号",
+          dataIndex: "workNum",
+          key: "workNum",
+          width: 50,
+          align: "left",
+          className: "h head",
+        },
         {
           title: "姓名",
           dataIndex: "userName",
@@ -233,13 +247,21 @@ export default {
           className: "h",
         },
         {
-          title: "课程成绩",
+          title: "作业成绩",
           dataIndex: "score",
           key: "score",
           width: 60,
           align: "center",
           className: "h",
         },
+        {
+          title: "评分",
+          dataIndex: "testscore",
+          key: "testscore",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
         {
           title: "任务状态",
           dataIndex: "status",
@@ -274,7 +296,7 @@ export default {
             <div
               class="studentopea1"
               onClick={() => {
-                console.log('---------')
+                state.CWvisible = true
               }}
             >  
               查看作业
@@ -414,8 +436,12 @@ export default {
     onUnmounted(() => {
       clearInterval(timer);
     });
+    const ckwork = ()=> {
+      state.CWvisible = true
+    }
     return {
       ...toRefs(state),
+      ckwork,
       selectProjectName,
       check,
       closeDrawer,
@@ -821,6 +847,26 @@ export default {
           background: #f6f9fd;
         }
 
+        .studentopea1 {
+          font-size: 14px;
+          font-weight: 400;
+          color: #387df7;
+          line-height: 22px;
+          padding-right: 8px;
+          border-right: 1px solid #e9e9e9;
+          cursor: pointer;
+        }
+        .studentopea2 {
+          font-size: 14px;
+          font-weight: 400;
+          color: #387df7;
+          line-height: 22px;
+          padding-right: 8px;
+          padding-left: 8px;
+          border-right: 1px solid #e9e9e9;
+          cursor: pointer;
+        }
+
         .pa {
           // left: 0;
           margin-top: 15px;
diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue
index f7c39cbd..7447d647 100644
--- a/src/components/drawers/FaceStu.vue
+++ b/src/components/drawers/FaceStu.vue
@@ -76,16 +76,16 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" style="margin-right: 20px">
+          <div class="btn btn1" style="margin-right: 20px" @click="signQR">
+            <div class="wz">签到二维码</div>
+          </div>
+          <div class="btn btn1" style="margin-right: 20px" @click="showImpStu">
             <div class="img1"></div>
-            <div class="wz" @click="showImpStu">导入学员</div>
+            <div class="wz">导入学员</div>
           </div>
           <div class="btn btn2" @click="showCopyModal">
             <div class="wz">批量签到</div>
           </div>
-          <div class="btn btn2" @click="showStopModal">
-            <div class="wz" @click="showEntryScore">批量签退</div>
-          </div>
           <div class="btn btn2">
             <div class="img2"></div>
             <div class="wz">导出数据</div>
@@ -149,6 +149,8 @@
       <button class="btn2">确定</button>
     </div>
   </a-drawer>
+  <!-- 二维码签到弹窗 -->
+  <SignQR v-model:signQRvisible="signQRvisible"/>
   <!-- 导入学员抽屉 -->
   <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
   <!-- 批量签到弹窗 -->
@@ -181,44 +183,18 @@
       </div>
     </div>
   </a-modal>
-  <!-- 批量签退弹窗 -->
-  <a-modal
-    v-model:visible="stopModal"
-    :footer="null"
-    :closable="closeStop"
-    wrapClassName="CopyModal"
-    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="closeStopModal"></div>
-        </div>
-        <div class="body">
-          <span>您确定要批量签退吗</span>
-        </div>
-        <div class="del_btnbox">
-          <div class="del_btn btn1">
-            <div class="btnText" @click="delete_exit">取消</div>
-          </div>
-          <div class="del_btn btn2">
-            <div class="btnText" @click="delete_exit">确定</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </a-modal>
 </template>
 
 <script>
 import { toRefs, reactive } from "vue";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
+import SignQR from "./SignQR.vue"
 export default {
   name: "FaceManage",
-  components: { ImpStu },
+  components: { 
+    ImpStu,
+    SignQR,
+ },
   props: {
     FSvisible: {
       type: Boolean,
@@ -234,6 +210,7 @@ export default {
       closeCopy: false, //签到弹窗关闭图标
       stopModal: false, //签退弹窗
       closeStop: false, //签退弹窗关闭图标
+      signQRvisible:false, //二维码弹窗
       name: null,
       showmodal: false, //勾选提示框
       closable: false, //modal右上角的关闭按钮
@@ -424,18 +401,14 @@ export default {
     const closeCopyModal = () => {
       state.copyModal = false;
     };
-    const showStopModal = () => {
-      state.stopModal = true;
-    };
     const closeStopModal = () => {
       state.stopModal = false;
     };
-    const showEntryScore = () => {
-      state.Evisible = true;
-    };
+    const signQR = ()=> {
+      state.signQRvisible = true
+    }
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
-
       state.selectedRowKeys = selectedRowKeys;
     };
 
@@ -578,14 +551,13 @@ export default {
       selectProjectName2,
       closeDrawer,
       onSelectChange,
-      showEntryScore,
       tableDataFunc,
       getTableData,
       showImpStu,
       showCopyModal,
       closeCopyModal,
-      showStopModal,
       closeStopModal,
+      signQR,
     };
   },
 };
@@ -746,6 +718,7 @@ export default {
       height: 100%;
       // background-color: #bfa;
       // overflow-y: auto;
+      padding-right: 10px;
       .titl {
         display: flex;
         .endtime {
diff --git a/src/components/drawers/SignQR.vue b/src/components/drawers/SignQR.vue
new file mode 100644
index 00000000..d6c72fc1
--- /dev/null
+++ b/src/components/drawers/SignQR.vue
@@ -0,0 +1,171 @@
+<template>
+    <a-modal 
+        :visible="signQRvisible" 
+        :footer="null" 
+        :closable="closeCopy" 
+        wrapClassName="signQRModal"
+        centered="true"
+        @cancel="closeModal"
+        >
+        <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="closeModal"></div>
+          </div>
+          <div class="body">
+            <div class="tit">{{"时间管理面授课程"}}</div>
+            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
+          </div>
+          <div class="footerr">
+            <div class="onload">下载二维码</div>
+            <div class="onloadpx">200*200</div>
+            <div class="onloadpx">400*400</div>
+            <div class="onloadpx">800*800</div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+</template>
+
+<script>
+import { reactive,toRefs } from '@vue/reactivity';
+export default {
+    name:"SignQR",
+    props:{
+        signQRvisible:{
+            type:Boolean,
+            default:false,
+        },
+    },
+    setup(props,ctx){
+        const state = reactive({
+            signQRvisible:false,
+            closeCopy: false, //二维码关闭图标
+        })
+        const closeModal = ()=> {
+            ctx.emit("update:signQRvisible",false)
+        }
+        const afterVisibleChange = (bool) => {
+            console.log(bool);
+        }
+        return{
+            ...toRefs(state),
+            closeModal,
+            afterVisibleChange,
+        }
+    }
+};
+</script>
+<style lang="scss">
+.signQRModal {
+  .ant-modal {
+    width: 532px !important;
+    height: 428px !important;
+
+    .ant-modal-content {
+      width: 532px !important;
+      height: 428px !important;
+
+      .ant-modal-body {
+        width: 532px !important;
+        height: 428px !important;
+        padding: 0 !important;
+
+        .delete {
+          z-index: 999;
+          width: 532px;
+          height: 428px;
+          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/coursewareManage/QR.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: 20px auto 36px auto;
+              display: flex;
+              flex-direction: column;
+              justify-content: center;
+              align-items: center;
+              .tit{
+                margin-bottom: 15px;
+                font-size: 16px;
+                font-weight: 500;
+                }
+            }
+
+            .footerr {
+              display: flex;
+              justify-content: center;
+              align-items: center;
+
+              .onload {
+                color: rgba(51, 51, 51, 1);
+                font-size: 14px;
+              }
+
+              .onloadpx {
+                width: 80px;
+                height: 32px;
+                border: 1px solid rgba(56, 125, 247, 1);
+                border-radius: 4px;
+                color: rgba(56, 125, 247, 1);
+                margin-left: 20px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                cursor: pointer;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index ca76fd5a..6cafdba1 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -74,7 +74,7 @@
         <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
           <a-table
             style="border: 1px solid #f2f6fe"
-            :columns="tablecolumns"
+            :columns="tableDataFunc()"
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
@@ -128,6 +128,10 @@ export default {
       type: Number,
       default: null,
     },
+    itemsType:{
+      type: Number,
+      default:null,
+    }
   },
 
   setup(props, ctx) {
@@ -137,7 +141,7 @@ export default {
       pageNo: 1,
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       projectName: "",
       projectNameList: [
         {
@@ -156,61 +160,177 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [
-        // {
-        //   key: 1,
-        //   name: "哈哈",
-        //   bum: "产品部",
-        //   gangw: "产品经理",
-        //   comp: "-",
-        //   score: "-",
-        //   time: "-",
-        //   state: "未完成",
-        // },
-      ],
-      tablecolumns: [
-        {
-          title: "姓名",
-          dataIndex: "userName",
-          key: "userName",
-          width: 50,
-          align: "left",
-          className: "h head",
-        },
-        {
-          title: "所在部门",
-          dataIndex: "deptName",
-          key: "userName",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "所在岗位",
-          dataIndex: "jobName",
-          key: "jobName",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "课程成绩",
-          dataIndex: "score",
-          key: "score",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "任务状态",
-          dataIndex: "status",
-          key: "status",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-      ],
+      tabledata: [],
     });
+    const tableDataFunc = () => {
+      if(props.itemsType == 10){
+        const columns = [
+            {
+              title: "工号",
+              dataIndex: "workNum",
+              key: "workNum",
+              width: 50,
+              align: "center",
+              className: "h",
+            },
+            {
+              title: "姓名",
+              dataIndex: "name",
+              key: "name",
+              width: 50,
+              align: "center",
+              className: "h",
+            },
+            {
+              title: "所在部门",
+              dataIndex: "deptName",
+              key: "deptName",
+              width: 50,
+              align: "center",
+              className: "h",
+            },
+            {
+              title: "所在岗位",
+              dataIndex: "jobName",
+              key: "jobName",
+              width: 50,
+              align: "center",
+              className: "h",
+            },
+            {
+              title: "提交时间",
+              dataIndex: "cur",
+              key: "cur",
+              width: 110,
+              align: "center",
+              className: "h",
+            },
+            {
+              title: "任务状态",
+              dataIndex: "state",
+              key: "state",
+              width: 50,
+              align: "center",
+              className: "h",
+            },
+            {
+              title: "PDF状态",
+              dataIndex: "pdfstate",
+              key: "pdfstate",
+              width: 50,
+              align: "center",
+              className: "h",
+            },
+        ];
+        return columns;
+      } else if(props.itemsType == 5){
+        const columns = [
+          {
+            title: "工号",
+            dataIndex: "workNum",
+            key: "workNum",
+            width: 50,
+            align: "center",
+            className: "h head",
+          },
+          {
+            title: "姓名",
+            dataIndex: "userName",
+            key: "userName",
+            width: 50,
+            align: "left",
+            className: "h head",
+          },
+          {
+            title: "所在部门",
+            dataIndex: "deptName",
+            key: "deptName",
+            width: 60,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "所在岗位",
+            dataIndex: "jobName",
+            key: "jobName",
+            width: 60,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "考试次数",
+            dataIndex: "testNum",
+            key: "testNum",
+            width: 60,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "成绩",
+            dataIndex: "score",
+            key: "score",
+            width: 60,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "完成时间",
+            dataIndex: "time",
+            key: "time",
+            width: 100,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "任务状态",
+            dataIndex: "status",
+            key: "status",
+            width: 60,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "操作",
+            dataIndex: "operation",
+            key: "operation",
+            width: 60,
+            align: "center",
+            className: "h",
+          },
+        ]
+        return columns;
+      }
+
+
+    };
+    //考试、测评管理列表操作
+    const ListOpera = () => {
+      let arr = state.tabledata;
+      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
+      arr.map((value) => {
+        value.operation = (
+          <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="operation"
+              onClick={() => {
+                console.log(state.tabledata,'++++++++++++');
+              }}
+            >  
+              查看
+            </div>
+          </div>
+        );
+      });
+      state.tabledata = arr;
+      console.log(state.tabledata,'-----------');
+    };
+    ListOpera();
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       state.projectName = value;
@@ -291,8 +411,9 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        // getManageList();
+        getManageList();
       }, 1000);
+      
       timer = setInterval(() => {
         state.open = false;
       }, 3000);
@@ -304,6 +425,7 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      tableDataFunc,
       showopen,
       onMounted,
       onUnmounted,
@@ -317,26 +439,10 @@ export default {
 </script>
 
 <style lang="scss">
-// .drawerStyle {
-//   .ant-drawer-content-wrapper {
-//     // max-width: 1000px;
-//     .ant-drawer-header {
-//       display: none !important;
-//     }
-//     .ant-drawer-body {
-//       padding: 0;
-//     }
-//   }
-
-// }
-//作业管理弹窗
-
-//作业管理弹窗
 .TestManage {
   .drawerMain {
     min-width: 520px;
     margin: 0px 32px 0px 32px;
-    // overflow-x: auto;
     display: flex;
     flex-direction: column;
     position: relative;
@@ -363,20 +469,17 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      // background-color: red;
       margin-bottom: 20px;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
         color: #333333;
         line-height: 25px;
-        // margin-left: 24px;
       }
     }
     .main {
       width: 100%;
       height: 100%;
-      // background-color: #bfa;
       overflow-y: auto;
       padding-right: 10px;
       .endtime {
@@ -497,15 +600,10 @@ export default {
         }
         .tableBox {
           .pa {
-            // left: 0;
             margin-top: 15px;
             width: 100%;
-            // height: 20px;
-            // background-color: red;
             display: flex;
             justify-content: center;
-            // position: absolute;
-            // bottom: 20px;
             .ant-pagination-prev,
             .ant-pagination-next,
             .ant-pagination-item,
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 8b8789ef..524d3fa2 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -70,7 +70,7 @@
         <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
           <a-table
             style="border: 1px solid #f2f6fe"
-            :columns="tablecolumns"
+            :columns="tableDataFunc()"
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
@@ -95,22 +95,27 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
+        <button class="btn1" @click="test()">取消</button>
         <button class="btn2">确定</button>
       </div>
       <div class="noticebox" v-show="open">
         <div><img src="../../assets/images/taskpage/check.png" /></div>
         <div class="notext">催促学员成功</div>
       </div>
+      <CVote v-model:CVvisible="CVvisible"/>
     </div>
   </a-drawer>
 </template>
 
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import CVote from "./CheckVote.vue"
 import * as api from "../../api/index";
 export default {
   name: "TimeManage",
+  components:{
+    CVote,
+  },
   props: {
     Tvisible: {
       type: Boolean,
@@ -124,17 +129,22 @@ export default {
       type: Number,
       default: null,
     },
+    itemsType:{
+      type:Number,
+      default:null,
+    }
   },
 
   setup(props, ctx) {
     const state = reactive({
       visible: props.Tvisible,
+      CVvisible:false, //查看投票抽屉
       name: "",
       open: false,
       pageNo: 1,
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       projectName: "",
       projectNameList: [
         {
@@ -153,59 +163,158 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [
-        // {
-        //   key: 1,
-        //   userName: "哈哈",
-        //   deptName: "产品部",
-        //   gangw: "产品经理",
-        //   time: "-",
-        //   state: "未完成",
-        // },
-      ],
-      tablecolumns: [
-        {
-          title: "姓名",
-          dataIndex: "userName",
-          key: "userName",
-          width: 50,
-          align: "left",
-          className: "h head",
-        },
-        {
-          title: "所在部门",
-          dataIndex: "deptName",
-          key: "userName",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "所在岗位",
-          dataIndex: "jobName",
-          key: "jobName",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "课程成绩",
-          dataIndex: "score",
-          key: "score",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "任务状态",
-          dataIndex: "status",
-          key: "status",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-      ],
+      tabledata: [],
     });
+    const tableDataFunc = ()=> {
+      if(
+            props.itemsType == 1 ||
+            props.itemsType == 3 || 
+            props.itemsType == 7 || 
+            props.itemsType == 8 || 
+            props.itemsType == 9 || 
+            props.itemsType == 11
+        ){
+            const columns =  [
+              {
+                title: "工号",
+                dataIndex: "workNum",
+                key: "workNum",
+                width: 50,
+                align: "center",
+                className: "h head",
+              },
+              {
+                title: "姓名",
+                dataIndex: "userName",
+                key: "userName",
+                width: 50,
+                align: "center",
+                className: "h head",
+              },
+              {
+                title: "所在部门",
+                dataIndex: "deptName",
+                key: "userName",
+                width: 60,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "所在岗位",
+                dataIndex: "jobName",
+                key: "jobName",
+                width: 60,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "完成时间",
+                dataIndex: "time",
+                key: "time",
+                width: 100,
+                align: "center",
+                className: "h",
+              },
+              {
+                title: "任务状态",
+                dataIndex: "status",
+                key: "status",
+                width: 60,
+                align: "center",
+                className: "h",
+              },
+            ]
+            return columns;
+          } else if(props.itemsType ==12 ){
+              const columns =  [
+                {
+                  title: "工号",
+                  dataIndex: "workNum",
+                  key: "workNum",
+                  width: 50,
+                  align: "center",
+                  className: "h head",
+                },
+                {
+                  title: "姓名",
+                  dataIndex: "userName",
+                  key: "userName",
+                  width: 50,
+                  align: "center",
+                  className: "h head",
+                },
+                {
+                  title: "所在部门",
+                  dataIndex: "deptName",
+                  key: "userName",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "所在岗位",
+                  dataIndex: "jobName",
+                  key: "jobName",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "完成时间",
+                  dataIndex: "time",
+                  key: "time",
+                  width: 100,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "任务状态",
+                  dataIndex: "status",
+                  key: "status",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "操作",
+                  dataIndex: "operation",
+                  key: "operation",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+              ]
+              return columns;
+        }
+    };
+    //在线投票等管理列表操作
+    const ListOpera = () => {
+      let arr = state.tabledata;
+      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
+      arr.map((value) => {
+        value.operation = (
+          <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="operation"
+              onClick={() => {
+                state.CVvisible = true;
+              }}
+            >  
+              查看
+            </div>
+          </div>
+        );
+      });
+      state.tabledata = arr;
+      console.log(state.tabledata,'-----------');
+    };
+    ListOpera();
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       state.projectName = value;
@@ -282,7 +391,9 @@ export default {
       state.tabledata = [];
       getManageList();
     };
-
+    const test = ()=> {
+      state.CVvisible = true
+    }
     let timer;
     onMounted(() => {
       setTimeout(() => {
@@ -296,9 +407,11 @@ export default {
       clearInterval(timer);
     });
     return {
+      test,
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      tableDataFunc,
       showopen,
       onMounted,
       onUnmounted,
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index a448ac2a..85c48a20 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -15,7 +15,7 @@
           @click="closeDrawer"
         />
       </div>
-      <div class="main">
+      <div class="main" style="padding-right:10px">
         <div class="endtime">起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00</div>
         <div class="search">
           <div class="sealeft">
@@ -62,10 +62,10 @@
             <div class="img1"></div>
             <div class="wz">导出数据</div>
           </div>
-          <div class="btn btn2" @click="showModal">
+          <div class="btn btn2" @click="showEHWorkModal" style="margin-right:20px">
             <div class="wz">导出作业</div>
           </div>
-          <div class="btn btn2" @click="showModal">
+          <div class="btn btn2" @click="showEScoreModal">
             <div class="wz">导入成绩</div>
           </div>
         </div>
@@ -101,29 +101,10 @@
         <button class="btn2">确定</button>
       </div>
 
-      <a-modal
-        v-model:visible="visible"
-        :closable="close"
-        :footer="null"
-        wrapClassName="WorkManage"
-        centered="true"
-      >
-        <div class="header">
-          <div class="inheader">
-            <div class="left">提示</div>
-            <div class="right" @click="closeModal"></div>
-          </div>
-        </div>
-        <div class="main">
-          <div class="check"></div>
-          <div class="text">作业导出完成，请在下载中心查看</div>
-          <div class="btn">
-            <button class="btn1 sabtn" @click="closeModal">取消</button>
-            <button class="btn2 sabtn">查看</button>
-          </div>
-        </div>
-      </a-modal>
-
+      <!-- 导出作业弹窗 -->
+      <EHWork v-model:exportHWorkvisible="exportHWorkvisible"/>
+      <!-- 导出成绩抽屉 -->
+      <EScore v-model:eScorevisible="eScorevisible"/>
       <!-- 作业详情抽屉 -->
       <work-detail v-model:WDvisible="WDvisible" />
     </div>
@@ -132,11 +113,17 @@
 
 <script>
 import { toRefs, reactive, onMounted } from "vue";
+import EHWork from "./ExportHWork.vue"
+import EScore from "./ExportScore.vue"
 import WorkDetail from "../drawers/WorkDetail.vue";
 import * as api from "../../api/index";
 export default {
   name: "WorkManage",
-  components: { WorkDetail },
+  components: { 
+    WorkDetail,
+    EHWork,
+    EScore,
+    },
   props: {
     Wvisible: {
       type: Boolean,
@@ -155,8 +142,8 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       name: null,
-      visible: false, //导出数据弹窗
-      close: false, //导出弹窗的关闭按钮
+      exportHWorkvisible:false, //导出作业弹窗
+      eScorevisible:false, //导入成绩抽屉
       WDvisible: false, //作业详情
       pageNo: 1,
       pageSize: 10,
@@ -180,18 +167,16 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [
-        // {
-        //   key: 1,
-        //   userName: "哈哈",
-        //   deptName: "产品部",
-        //   jobName: "产品经理",
-        //   comp: "好好学习",
-        //   time: "-",
-        //   state: "未完成",
-        // },
-      ],
+      tabledata: [],
       tablecolumns: [
+        {
+          title: "工号",
+          dataIndex: "workNum",
+          key: "workNum",
+          width: 50,
+          align: "left",
+          className: "h head",
+        },
         {
           title: "姓名",
           dataIndex: "userName",
@@ -217,13 +202,21 @@ export default {
           className: "h",
         },
         {
-          title: "课程成绩",
+          title: "作业成绩",
           dataIndex: "score",
           key: "score",
           width: 60,
           align: "center",
           className: "h",
         },
+        {
+          title: "评分",
+          dataIndex: "testscore",
+          key: "testscore",
+          width: 60,
+          align: "center",
+          className: "h",
+        },
         {
           title: "任务状态",
           dataIndex: "status",
@@ -232,8 +225,44 @@ export default {
           align: "center",
           className: "h",
         },
+        {
+          title: "操作",
+          dataIndex: "operation",
+          key: "operation",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
       ],
     });
+    //作业管理列表操作
+    const ListOpera = () => {
+      let arr = state.tabledata;
+      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
+      arr.map((value) => {
+        value.operation = (
+          <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="operation"
+              onClick={() => {
+                console.log(state.tabledata,'++++++++++++');
+              }}
+            >  
+              查看
+            </div>
+          </div>
+        );
+      });
+      state.tabledata = arr;
+      console.log(state.tabledata,'-----------');
+    };
+    ListOpera();
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       state.projectName = value;
@@ -241,15 +270,15 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:Wvisible", false);
     };
-    const showModal = () => {
-      state.visible = true;
-    };
-    const closeModal = () => {
-      state.visible = false;
+    const showEHWorkModal = () => {
+      state.exportHWorkvisible = true;
     };
     const showWorkDetail = () => {
       state.WDvisible = true;
     };
+    const showEScoreModal = ()=> {
+      state.eScorevisible = true;
+    } 
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
@@ -326,8 +355,8 @@ export default {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
-      showModal,
-      closeModal,
+      showEHWorkModal,
+      showEScoreModal,
       showWorkDetail,
       onChange,
       getManageList,
@@ -339,19 +368,6 @@ export default {
 </script>
 
 <style lang="scss">
-// .drawerStyle {
-//   .ant-drawer-content-wrapper {
-//     // max-width: 1000px;
-//     .ant-drawer-header {
-//       display: none !important;
-//     }
-//     .ant-drawer-body {
-//       padding: 0;
-//     }
-//   }
-
-// }
-//作业管理弹窗
 .WorkManage {
   .ant-modal {
     width: 473px;
@@ -400,13 +416,10 @@ export default {
         }
 
         .main {
-          // background-color: red;
           width: 100%;
-          // height: 100%;
           margin-top: 32px;
           display: flex;
           flex-direction: column;
-          // justify-content: center;
           align-items: center;
           overflow-y: auto;
           padding-right: 10px;
@@ -453,198 +466,5 @@ export default {
     }
   }
 }
-//作业管理弹窗
-.WorkManage {
-  .drawerMain {
-    min-width: 550px;
-    margin: 0px 32px 0px 32px;
-    overflow-x: auto;
-    display: flex;
-    flex-direction: column;
-    .header {
-      height: 73px;
-      border-bottom: 1px solid #e8e8e8;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      // background-color: red;
-      margin-bottom: 20px;
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        // margin-left: 24px;
-      }
-    }
-    .main {
-      width: 100%;
-      height: 100%;
-      // margin-bottom: 30px;
-      // background-color: #bfa;
-      overflow-y: auto;
-      .endtime {
-        font-size: 16px;
-        font-weight: 500;
-        color: #333333;
-      }
-      .search {
-        width: 100%;
-        display: flex;
-        flex-wrap: wrap;
-        margin-top: 20px;
-        justify-content: space-between;
-
-        .sealeft {
-          display: flex;
-          flex-wrap: wrap;
-          .namecon {
-            display: flex;
-            flex-wrap: nowrap;
-            margin-bottom: 10px;
-            .name {
-              margin-top: 8px;
-              white-space: nowrap;
-            }
-          }
-        }
-        .btns {
-          display: flex;
-          flex-wrap: nowrap;
-
-          .btn {
-            cursor: pointer;
-            width: 100px;
-            height: 40px;
-            border-radius: 8px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            .img1 {
-              width: 15px;
-              height: 17px;
-              background-image: url(../../assets/images/courseManage/search0.png);
-              background-size: 100% 100%;
-              margin-right: 7px;
-            }
-            .img2 {
-              width: 16px;
-              height: 18px;
-              background-image: url(../../assets/images/courseManage/reset1.png);
-              background-size: 100% 100%;
-              margin-right: 7px;
-            }
-          }
-
-          .btn1 {
-            background: #409eff;
-
-            color: #ffffff;
-          }
-          .btn2 {
-            background: #ffffff;
-
-            color: #388be1;
-            border: 1px solid #388be1;
-          }
-        }
-      }
-      .btnss {
-        display: flex;
-        flex-wrap: nowrap;
-
-        .btn {
-          cursor: pointer;
-          width: 130px;
-          height: 40px;
-          border-radius: 8px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          .img1 {
-            width: 17px;
-            height: 16px;
-            background-image: url(../../assets/images/coursewareManage/export1.png);
-            background-size: 100% 100%;
-            margin-right: 7px;
-          }
-        }
-
-        .btn1 {
-          background: #409eff;
-
-          color: #ffffff;
-        }
-        .btn2 {
-          background: #ffffff;
-
-          color: #388be1;
-          border: 1px solid #388be1;
-        }
-      }
-      .tab {
-        th.h {
-          background-color: #eff4fc !important;
-        }
-
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .tableBox {
-          .pa {
-            // left: 0;
-            margin-top: 15px;
-            width: 100%;
-            // height: 20px;
-            // background-color: red;
-            display: flex;
-            justify-content: center;
-            // position: absolute;
-            // bottom: 20px;
-            .ant-pagination-prev,
-            .ant-pagination-next,
-            .ant-pagination-item,
-            .ant-pagination-options {
-              margin-bottom: 10px;
-            }
-          }
-        }
-      }
-    }
-
-    .btnn {
-      height: 72px;
-      width: 100%;
-      position: absolute;
-      bottom: 0;
-      background-color: #fff;
-      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: #409eff;
-        border-radius: 8px;
-        border: 0;
-        margin-left: 15px;
-        color: #fff;
-      }
-    }
-  }
-}
 </style>
+
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 918c39d7..8670cacd 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -67,9 +67,6 @@
                         {{ element.name }}
                       </div>
                     </template>
-                    <!-- <template #title>
-                        <span>关卡说明</span>
-                      </template> -->
                     <div class="nname">
                       {{ element.name }}
                     </div>
@@ -450,7 +447,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item" @click="showDrawerAddVote">
+        <div class="item" @click="showDrawerAddProj">
           <div class="itcon">
             <div class="img">
               <img
@@ -684,7 +681,7 @@
       </div>
       <div class="draw" style="position: relative">
         <a-drawer
-          v-model:visible="visible"
+          v-model:visible="addprojvisible"
           class="drawerStyle ProjectDrawer"
           title="关联项目"
           placement="right"
@@ -697,7 +694,7 @@
               <img
                 style="width: 29px; height: 29px; cursor: pointer"
                 src="../../assets/images/basicinfo/close.png"
-                @click="closeDrawer"
+                @click="leaveProjDrawer"
               />
             </div>
             <div class="drawerbox">
@@ -712,8 +709,8 @@
               </a-table>
             </div>
             <div class="btnn">
-              <button @click="showDrawer" class="btn1">取消</button>
-              <button @click="showDrawer" class="btn2">确定</button>
+              <button @click="leaveProjDrawer" class="btn1">取消</button>
+              <button @click="updateTask" class="btn2">确定</button>
             </div>
           </div>
         </a-drawer>
@@ -984,7 +981,7 @@ import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
-import * as apiProj from "../../api/indexInvist.js";
+import * as apiProj from "../../api/index.js";
 import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import { toDate } from "../../api/method";
@@ -1325,7 +1322,6 @@ export default {
     //关闭项目抽屉
     const leaveProjDrawer = () => {
       state.addprojvisible = false;
-      state.isLevel = false;
     };
     //在线抽屉
     const showDrawerAddOnline = (id,eleId)=>{
@@ -1935,22 +1931,25 @@ export default {
     //获取全部项目信息接口
     const getAllProjText = () => {
       apiProj
-        .queryAssessmentDetailList({
-          assessmentName: "",
-          pageNo: state.currentPage,
-          pageSize: state.pageSize,
+        .getProjectList({
+          "beginTime": 0,
+          "createName": "",
+          "endTime": 0,
+          "manager": "",
+          "name": "",
+          "pageNo": 0,
+          "pageSize": 0,
+          "status": 0
         })
         .then((res) => {
-          let arr = res.data.data.rows;
           if (res.status === 200) {
-            getTableDate(arr);
-            console.log('---------------项目信息---------------------------');
+            let arr = res.data.data.rows;
+            console.log(arr,'-------------------------------');
           }
         })
         .catch((err) => {
           console.log("获取全部项目信息接口失败", err);
           console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
-          // state.createLoading = false;
         });
     };
     const updateTask = () => {
@@ -2054,10 +2053,6 @@ export default {
           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%);
@@ -2100,7 +2095,6 @@ export default {
               justify-content: center;
               align-items: center;
               flex-direction: column;
-              // background-color: red;
               position: relative;
               .back {
                 position: absolute;
@@ -2159,7 +2153,6 @@ export default {
         width: 549px !important;
         height: 245px !important;
         .con {
-          // background-color: #bfa;
           width: 100%;
           height: 100%;
 
@@ -2263,7 +2256,6 @@ export default {
       height: 388px !important;
       border-radius: 4px !important;
       .ant-modal-body {
-        // background-color: blue;
         width: 100% !important;
         height: 100% !important;
         padding: 0 !important;
@@ -2300,13 +2292,11 @@ export default {
         .main {
           width: 100%;
           height: calc(100% - 68px);
-          // background-color: #bfa;
           display: flex;
           justify-content: center;
           .inma {
             width: 75%;
             height: 100%;
-            // background-color: lightblue;
             .name {
               display: flex;
               position: relative;
@@ -2392,19 +2382,9 @@ export default {
   }
 }
 .ProjectDrawer {
-  // .ant-drawer-content-wrapper {
-
-  //   .ant-drawer-header {
-  //     display: none !important;
-  //   }
-  //   .ant-drawer-body {
-  //     padding: 0;
-  //   }
-  // }
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
     display: flex;
     flex-direction: column;
     .header {
@@ -2413,7 +2393,6 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
       .headerTitle {
@@ -2421,11 +2400,10 @@ export default {
         font-weight: 600;
         color: #333333;
         line-height: 25px;
-        // margin-left: 24px;
       }
     }
     .drawerbox {
-      margin: 20px 38px 30px;
+      overflow-y: auto;
       th {
         background-color: #eff4fc !important;
       }
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 38f4eb9c..3d6746ec 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -406,7 +406,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA(item.type)"
+                        @click="showAA(item.name,)"
                         :style="{
                           display:
                             item.type == '6' || item.type == '9'
@@ -433,10 +433,11 @@
                           item.type == '7' ||
                           item.type == '8' ||
                           item.type == '9' ||
-                          item.type == '11'
-                            ? showTime(item.name, item.projectTaskId)
+                          item.type == '11' ||
+                          item.type == '12'
+                            ? showTime(item.name, item.projectTaskId, item.type)
                             : item.type == '5' || item.type == '10'
-                            ? showTest(item.name, item.projectTaskId)
+                            ? showTest(item.name, item.projectTaskId, item.type)
                             : item.type == '2' || item.type == '6'
                             ? showFace(item.name,item.projectTaskId)
                             : item.type == '4'
@@ -1024,6 +1025,7 @@
       v-if="visible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
+      :itemsType="itemstype"
     />
     <!-- 面授管理抽屉 -->
     <face-manage
@@ -1067,7 +1069,7 @@
       :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
-    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" />
+    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" :itemsType="itemstype"/>
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
     
@@ -2019,7 +2021,8 @@ export default {
       showWorkText:"",
       //直播、活动页面传递参数
       showkaoqinText: "",
-
+      //所有抽屉的传过去的type
+      itemstype:null,
 
       //排行榜时间
       rankStartTime: null,
@@ -2311,11 +2314,12 @@ export default {
       state.TaskFaceImpStuvisible = true;
     };
     //新增
-    const showTime = (name, id) => {
+    const showTime = (name, id, type) => {
       console.log("点击管理并传了id");
       state.visible = true;
       state.showTimeText = name;
       state.projectTaskId = id;
+      state.itemstype = Number(type);
     };
     //新增
     const showFace = (name, id) => {
@@ -2340,9 +2344,9 @@ export default {
       state.chooseGroupId = id;
     };
     //活动考勤的抽屉
-    const showAA = (course) => {
+    const showAA = (title) => {
       state.AAvisible = true;
-      state.showkaoqinText = "【" + course + "】" + "考勤";
+      state.showkaoqinText = title;
     };
     //作业管理的抽屉
     const showWork = (name,id) => {
@@ -2350,11 +2354,12 @@ export default {
       state.showWorkText = name;
       state.projectTaskId = id;
     };
-    //考试管理的抽屉
-    const showTest = (name, id) => {
+    //考试、测评管理的抽屉
+    const showTest = (name, id, type) => {
       state.TMvisible = true;
       state.showTestText = name;
       state.projectTaskId = id;
+      state.itemstype = Number(type);
     };
     const showStuAdd = () => {
       state.Stuvisible = true;
diff --git a/vue.config.js b/vue.config.js
index 83ff56c7..3b7a83cb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,8 @@ module.exports = defineConfig({
     port:8080,
     proxy: {
       "/api": {
-        target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
+        target: "http://192.168.100.208:30019/",
+        // target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
         changeOrigin: true, //表示是否改变原域名
         // secure: false,
         // ws: false, //表示WebSocket协议

From 0acb1f027d68863ce2926d906ac49cebed4affa3 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Thu, 17 Nov 2022 18:50:05 +0800
Subject: [PATCH 63/90] =?UTF-8?q?fix=EF=BC=9Aconfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 3b7a83cb..278c0e97 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,8 +5,8 @@ module.exports = defineConfig({
     port:8080,
     proxy: {
       "/api": {
-        target: "http://192.168.100.208:30019/",
-        // target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
+        // target: "http://192.168.100.208:30019/",
+        target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
         changeOrigin: true, //表示是否改变原域名
         // secure: false,
         // ws: false, //表示WebSocket协议

From 132381cc881c0bf62bd6a4684e63db93f69091c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Thu, 17 Nov 2022 18:53:50 +0800
Subject: [PATCH 64/90] =?UTF-8?q?feat:=20=E6=8A=95=E7=A5=A8=E9=A2=98?=
 =?UTF-8?q?=E5=B9=B2=E8=8E=B7=E5=8F=96=EF=BC=8C=E6=88=90=E5=91=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E6=90=9C=E7=B4=A2=EF=BC=8C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexVote.js                    |    4 +-
 src/components/vote/AddVote.vue         |   21 +-
 src/components/vote/queryStem.vue       |   86 ++
 src/views/learningpath/LevelAdd.vue     |   94 +-
 src/views/projectcenter/LibraryAdd.vue  |   21 +-
 src/views/projectcenter/templateAdd.vue | 1359 +++++++++++++++++++++++
 6 files changed, 1557 insertions(+), 28 deletions(-)
 create mode 100644 src/components/vote/queryStem.vue
 create mode 100644 src/views/projectcenter/templateAdd.vue

diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index fd1a7437..11b05e52 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -63,7 +63,9 @@ export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOpti
 export const editVote = (obj) => http.post('/vote/editVote', obj)
 
 //根据题干ID获取题干信息
-export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj })
+export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{
+    headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'}
+})
 
 //修改题干信息接口
 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj);
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index ed6c398f..2b187118 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -56,6 +56,7 @@
               >
                 创建投票
               </button>
+              <a @click="queryStem">查看投票</a>
               <div>
             <CreateVote
               v-model:createVoteVisible="createVoteVisible"
@@ -77,6 +78,13 @@
                 </div>
               </div>
             </div>
+            
+            <!-- 查看投票弹窗 -->
+            <queryStem  @closeDrawer="closeStem"
+            v-model:addStemVisible="addStemVisible" />
+
+
+
             <!-- 创建投票侧弹窗 -->
             <div>
               <create-vote
@@ -142,12 +150,13 @@ import { message } from "ant-design-vue";
 import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import * as apiTask from "../../api/indexTaskadd";
-
+import queryStem from "./queryStem.vue"
 
 export default {
   name: "AddVote",
   components: {
     CreateVote,
+    queryStem,
   },
   props: {
     addvoteVisible: {
@@ -210,6 +219,7 @@ export default {
       editStem: false,  //编辑状态
       ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
+      addStemVisible:false, //
       editChild:false,
     });
     const closeDrawer = () => {
@@ -366,6 +376,12 @@ export default {
       }
       
     }
+    const queryStem = () => {
+      state.addStemVisible = true;
+    };
+    const closeStem = () => {
+      state.addStemVisible = false;
+    };
     return {
       ...toRefs(state),
       showDrawerCreVote,
@@ -376,7 +392,8 @@ export default {
       dleVoteStem,
       updateVoteInfo,
       delBox,
-      
+      queryStem,
+      closeStem,
     };
   },
 };
diff --git a/src/components/vote/queryStem.vue b/src/components/vote/queryStem.vue
new file mode 100644
index 00000000..e3be6c23
--- /dev/null
+++ b/src/components/vote/queryStem.vue
@@ -0,0 +1,86 @@
+<template>
+    <a-drawer :visible="addStemVisible"
+        placement="right" class="custom-class" 
+        @after-visible-change="afterVisibleChange"
+        @close="closeDrawer" width="60%">
+        <div>
+            <h2 style="text-align:center;">投票查看</h2>
+            <div v-for="(item,index) in form" :key="item.voteStemId">
+            <div class="title">{{index+1}}. {{item.voteStemName}}</div>
+            <a-radio-group v-model:value="item.voteStemId">
+            <a-radio :value="3" :style="radioStyle">
+                {{item.optionDetailList[0].optionName}}</a-radio>
+                 <br />
+             <a-radio :value="2" :style="radioStyle">
+                {{item.optionDetailList[1].optionName}}</a-radio>
+            </a-radio-group>
+            </div>
+
+        </div>
+    </a-drawer>
+</template>
+
+<script>
+import { reactive, toRefs,ref } from "vue";
+import { message } from "ant-design-vue";
+import * as api  from "@/api/indexVote"
+
+export default {
+    name: "queryStem",
+    props: {
+        addStemVisible:{
+            type: Boolean,
+            default: false,
+        }
+    },
+    setup(props,ctx) {
+        const value = ref(1);
+        const state = reactive({
+            form:[],
+            
+        });
+        const radioStyle = reactive({
+      display: 'flex',
+      height: '30px',
+      lineHeight: '30px',
+    });
+        const afterVisibleChange = (bool) => {
+            if(bool === true) {
+                getStem()
+            }
+        }
+        const getStem = () => {
+            let obj = {
+                stemId:0,
+                ballotId:2,
+            }
+            api.queryStemByStemId(obj).then((res) => {
+                state.form = res.data.data
+                console.log(JSON.stringify(res.data)+'***');
+                message.success("投票获取成功");
+                console.log(res);
+            }).catch((err) => {
+                message.error("投票获取失败"+err);
+                console.log(err);
+            })
+        }
+        const closeDrawer = () => {
+            ctx.emit("closeDrawer")
+        }
+        return {
+            ...toRefs(state),
+            afterVisibleChange,
+            closeDrawer,
+            radioStyle,
+            value
+        }
+    }
+}
+</script>
+
+<style>
+.title {
+    font-size: 17px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index b363e8c2..83c1647d 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -98,10 +98,12 @@
               <div class="taskmain">快速创建项目详情</div>
             </div>
             <div class="second">
+              <router-link :to="{ path: '/leveladddetail' }">
               <div
                 class="taskbox"
                 style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
+             
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left1.png" />
                 </div>
@@ -116,8 +118,9 @@
                 </div>
                 <div class="centermain">快速添加任务/关卡</div>
               </div>
+            </router-link>
               <div
-                class="taskbox"
+                class="taskbox" @click="showAddStu"
                 style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
               >
                 <div class="leftt">
@@ -129,7 +132,9 @@
                 <div class="rightt">
                   <img src="../../assets/images/taskpage/right2.png" />
                 </div>
-                <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
+                <div class="centerbox"
+                
+                style="color: rgba(78, 166, 255, 1)">
                   添加学员
                 </div>
                 <div class="centermain">快速添加学员</div>
@@ -155,7 +160,6 @@
               </div>
             </div>
           </div>
-          <!-- 概览（无数据） -->
           <!-- 概览（有数据） -->
           <div :style="{ display: nodata ? 'none' : 'block' }">
             <div class="onerow"><div class="taskmain">关卡概览</div></div>
@@ -215,16 +219,16 @@
                   stage2: item.stageId != choosedStageId,
                 }"
                 :key="item.stageId"
-                @click="choosedStageId = item.stageId"
+                @click="stageChange(item.name,item.stageId)"
               >
-                {{ item.stage }}
+              关卡{{ item.stageId }}
               </div>
               <!-- <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
               <div class="staname">关卡名称：</div>
-              <div class="stamess">管理者进阶-腾飞班1第一关卡</div>
+              <div class="stamess">{{stateName}}</div>
             </div>
             <div class="stagelast">
               <div class="stagepro">
@@ -578,8 +582,8 @@
                   <a-select
                     style="width: 130px"
                     value="更多操作"
-                    :options="projectNameListt"
-                    @change="selectProjectName"
+                    @change="handleStuChange"
+                    :options="projectNameList"
                   ></a-select>
                 </div>
               </div>
@@ -588,12 +592,12 @@
                 <div class="xu">
                   <span class="yi">已选择</span>
                   <div style="width: 5px; display: inline-block"></div>
-                  <span class="th">3</span>
+                  <span class="th">{{selectedRowKeys.length}}</span>
                   <div style="width: 5px; display: inline-block"></div>
                   <span class="yi">项</span>
                   <span class="zon">列表选项总数：</span>
-                  <span class="yi">5</span>
-                  <span class="yi">条</span>
+                  <span class="th">{{tableData.length}}</span>
+                  <span class="yi"> 条</span>
                 </div>
               </div>
               <div class="tableBox" style="margin-top: 30px">
@@ -1203,6 +1207,7 @@ export default {
       CheckStuvisible: false, //学员管理的查看抽屉
       addLoading: false, // 加载动画
       choosedStageId: 1, // 选择的阶段id
+      selectedRowKeys:[],
       twobtn: true,
       number: true,
       twobtnn: false,
@@ -1214,6 +1219,20 @@ export default {
       styTitle: null,
       cretime: null,
       picUrl: null,
+      projectNameList:[
+        { 
+          value: '1',
+          label: '导出信息',
+        },
+        { 
+          value: '2',
+          label: '批量调整关卡',
+        },
+        { 
+          value: '3',
+          label: '批量删除',
+        }
+      ],
       // 共享文档列表
       docList: [
         {
@@ -1262,7 +1281,7 @@ export default {
       pageSize: 10,
       visiblene: false,
       sh: false,
-      nodata: false,
+      nodata: true,
       closeDeleteAll: false,
       curLevel: "",
       taskSyllabusActive: 0,
@@ -1279,6 +1298,7 @@ export default {
       visible: false, //时间管理
       TMvisible: false, //考试管理
       FaceVisivle: false, //面授管理
+      stateName:null, // 关卡名称
       //关卡的数据
       level: [
         // {
@@ -1330,11 +1350,11 @@ export default {
         // 阶段列表
         {
           stageId: 1,
-          stage: "关卡一",
+          name: "关卡一xx",
         },
         {
           stageId: 2,
-          stage: "关卡二",
+          name: "关卡二xx",
         },
       ],
     });
@@ -1542,7 +1562,10 @@ export default {
     const closehuodModal = () => {
       state.huodModal = false;
     };
-
+    const stageChange = (name,id) => {
+      state.choosedStageId = id;
+      state.stateName = name;
+    }
     const changeTabs = (e) => {
       console.log("切换tabs", e, state.routerId);
       if (e == 2) {
@@ -1567,12 +1590,12 @@ export default {
         .then((res) => {
           console.log("获取学员列表", res);
           let data = res.data.data.rows || null;
-          state.tableData = [];
+          // state.tableData = [];
           if (data.length) {
             for (let i in data) {
               let _time = new Date(data[i].beginStudyTime * 1000);
               state.tableData.push({
-                key: i + 1,
+                key: data[i].studentId,
                 com: data[i].userInfoBo.deptName,
                 name: data[i].userInfoBo.userName,
                 gang: data[i].userInfoBo.jobName,
@@ -1620,6 +1643,7 @@ export default {
     onMounted(() => {
       state.addLoading = true;
       getOverview();
+      myGetRouterDetail();
       reget();
     });
     const closePub = () => {
@@ -1807,8 +1831,10 @@ export default {
     const myGetRouterDetail = () => {
       GetRouterDetail(state.routerId)
         .then((res) => {
+          if(res.data.data.routerInfo.status == 1) {
+            state.nodata = false;
+          }
           let data = res.data.data.chapterList;
-
           state.taskSyllabus = data;
           // for(let i in data) {
           //   state.taskSyllabus[i].name = data[i].name
@@ -1819,8 +1845,13 @@ export default {
           // })
           //   }
           //   }
-
-          // }
+          levelList.stageList = [];
+          for(let i in data) {
+            if(i==0) {state.stateName = data[0].name}
+          levelList.stageList.push({
+          stageId:Number(i)+1,
+          name:data[i].name
+      }) }
         })
         .catch((err) => {
           console.log(err);
@@ -1869,6 +1900,27 @@ export default {
       state.gatenamee = '';
       getStudent();
     };
+    const handleStuChange = (value) => {
+      console.log(value);
+      if(value == 2) {state.visiblene = true}
+      if(value == 3 ) { deleteStu() }
+    };
+    const deleteStu = () => {
+      if(state.selectedRowKeys.length == 0) {
+        message.warning("请选择成员");
+        return }
+      let obj = {
+        routerId:100,
+        studentIds:state.selectedRowKeys,
+      }
+      api.delStudent(obj).then((res) => {
+        console.log(res);
+        message.success("批量删除成功")
+      }).catch(err => {
+        message.error("批量删除失败"+err);
+        console.log(err)
+      })
+    };
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -1898,6 +1950,7 @@ export default {
       changeTabs,
       checkType,
       handleChange,
+      handleStuChange,
       delConfirm,
       searchLevel,
       resetLevel,
@@ -1914,6 +1967,7 @@ export default {
       stopLearnPath,
       showStop,
       reget,
+      stageChange,
     };
   },
 };
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 87f27829..d2738cac 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -200,7 +200,7 @@
                               : 'none',
                         }"
                       >
-                      考勤
+                      <!-- 考勤 -->
                       </div>
                       <div
                         class="operation"
@@ -214,7 +214,7 @@
                               : 'none',
                         }"
                       >
-                        二维码
+                        <!-- 二维码 -->
                       </div>
                       <div
                         class="operation"
@@ -238,7 +238,7 @@
                             : null
                         "
                       >
-                        管理
+                        <!-- 管理 -->
                       </div>
                     </div>
                   </div>
@@ -388,7 +388,7 @@
           <div class="setting">
             <div class="set_tit">
               <span>基本信息</span>
-              <span class="editBtn" @click="() => {isEdit=true}">编辑</span>
+              <span class="editBtn" @click="toEdit">编辑</span>
             </div>
             <hr color="#E8E8E8" />
             <div class="set_body">
@@ -593,6 +593,7 @@
 import { ref, reactive, defineComponent, toRefs, onMounted} from "vue";
 import { message } from "ant-design-vue";
 import * as api from "@/api/indexTemplate"
+import { useRouter } from "vue-router";
 export default defineComponent({
   name: "LibraryAdd",
   setup() {
@@ -790,6 +791,7 @@ export default defineComponent({
     const value = ref("");
     const value2 = ref("");
     const textnum = "150";
+    const routered = useRouter();
     const changeopclo = () => {
       state.hideshow = !state.hideshow;
     };
@@ -907,7 +909,15 @@ export default defineComponent({
       console.log(err)
     })
     }
-    
+    const toEdit = () => {
+      routered.push({
+          path: "/templateAdd",
+          query: {
+            projectId: state.projectId,
+            name: state.name,
+          },
+        });
+    }
     // 新建或编辑阶段 
     const stateEdit = () => {
       let obj={
@@ -959,6 +969,7 @@ export default defineComponent({
       taskDel,
       stateEdit,
       taskEdit,
+      toEdit,
     };
   },
   computed: {
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
new file mode 100644
index 00000000..a5cc20ae
--- /dev/null
+++ b/src/views/projectcenter/templateAdd.vue
@@ -0,0 +1,1359 @@
+<!---- 创建模板页面 --->
+<template>
+    <div class="projectAdd">
+      <div class="header">
+        <span class="title">创建/编辑单层模板</span>
+        <div
+          @click="backPage"
+          style="cursor: pointer"
+          to="/libraryAdd"
+          class="goback"
+        >
+          <span class="return"></span><span class="returntext">返回</span>
+        </div>
+      </div>
+      <div class="content">
+        <div class="main">
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">模板名称</div>
+            </div>
+            <div class="in">
+              <a-input
+                v-model:value="projectName"
+                placeholder="请输入模板名称"
+                show-count
+                :maxlength="30"
+                :disabled="viewDetail ? true : false"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">分类</div>
+            </div>
+            <div class="in select">
+              <a-select
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                v-model:value="classifySelect"
+                placeholder="四个养成"
+                style="width: 100%"
+                :options="classifyList"
+                @change="classificationChange"
+                allowClear
+                showSearch
+                :disabled="viewDetail ? true : false"
+              >
+              </a-select>
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">封面图</div>
+            </div>
+            <div
+              class="box"
+              style="
+                width: 100px;
+                height: 100px;
+                border: 1px solid rgba(78, 166, 255, 1);
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+              "
+            >
+              <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"
+                :disabled="viewDetail ? true : false"
+              >
+                <img
+                  style="
+                    width: 100px;
+                    height: 100px;
+                    margin-bottom: 4px;
+                    margin-right: 4px;
+                  "
+                  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="box1"></div>
+                  <div class="box2"></div>
+                  <!-- <div class="ant-upload-text"></div> -->
+                </div>
+              </a-upload>
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">项目时间</div>
+            </div>
+  
+            <div class="in">
+              <a-range-picker
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="rangevalue"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                @change="onRangeChange"
+                :disabled="viewDetail ? true : false"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">项目经理</div>
+            </div>
+            <div class="in">
+              <a-select
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                :value="classifySelect1"
+                mode="multiple"
+                placeholder="请选择项目经理"
+                style="width: 100%"
+                :options="classifyList1"
+                @change="classificationChange1"
+                allowClear
+                showSearch
+                :disabled="viewDetail ? true : false"
+              >
+              </a-select>
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">资源归属</div>
+            </div>
+  
+            <div class="in select">
+              <a-select
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                v-model:value="classifySelect2"
+                placeholder="自动带出 可修改"
+                :options="classifyList2"
+                @change="classificationChange2"
+                :disabled="viewDetail ? true : false"
+              />
+            </div>
+          </div>
+          <div class="name name2">
+            <div class="namebox">
+              <div class="inname" style="margin-top: 13px">模板说明</div>
+            </div>
+            <div class="in">
+              <a-textarea
+                v-model:value="remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
+              />
+            </div>
+          </div>
+          <div class="name name2">
+            <div class="namebox">
+              <div class="inname">同步学习记录</div>
+            </div>
+            <div class="in">
+              <a-radio
+                @click="changeChecked"
+                v-model:checked="checked"
+                :disabled="viewDetail ? true : false"
+                ><span
+                  style="
+                    width: 100%;
+                    color: rgba(109, 117, 132, 1);
+                    font-size: 14px;
+                  "
+                  >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                ></a-radio
+              >
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">项目级别</div>
+            </div>
+            <div class="in select">
+              <a-select
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                v-model:value="classifySelect3"
+                :options="classifyList3"
+                @change="classificationChange3"
+                placeholder="集团级/组织级/现地级/部门级"
+                :disabled="viewDetail ? true : false"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">培训体系</div>
+            </div>
+            <div class="in select">
+              <a-select
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                v-model:value="classifySelect4"
+                :options="classifyList4"
+                @change="classificationChange4"
+                placeholder="集团级/组织级/现地级/部门级"
+                :disabled="viewDetail ? true : false"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="namebox">
+              <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+              <div class="inname">是否BOEU实施</div>
+            </div>
+            <div class="in">
+              <a-radio
+                @click="changeChecked1"
+                v-model:checked="checked1"
+                :disabled="viewDetail ? true : false"
+                ><span
+                  style="
+                    width: 100%;
+                    color: rgba(109, 117, 132, 1);
+                    font-size: 14px;
+                  "
+                  >BOEU实施</span
+                ></a-radio
+              >
+            </div>
+          </div>
+          <!-- <div class="name name2">
+                      <div class="namebox" style="margin-top: 8px">
+                          <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+                          <div class="inname">附件</div>
+                      </div>
+                      <div class="filebox">
+                          <div>
+                              <img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
+                              <a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
+                                  @remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
+                                  <span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
+                                  <span v-else class="filetext">上传附件</span>
+                              </a-upload>
+                          </div>
+                          <div class="support">
+                              支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
+                          </div>
+                      </div>
+                  </div> -->
+        </div>
+        <!--  选择模板 ------------------------------ -->
+        <div class="template" style="display: none">
+          <div class="name">
+            <div class="inname" style="width: 50px">模版</div>
+            <div class="in select" style="margin-left: 2px">
+              <a-select
+                v-if="isEdit"
+                disabled="true"
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                v-model:value="classifySelect5"
+                placeholder="请选择模版"
+                :size="size"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+              >
+              </a-select>
+              <a-select
+                v-else
+                :getPopupContainer="
+                  (triggerNode) => {
+                    return triggerNode.parentNode || document.body;
+                  }
+                "
+                v-model:value="classifySelect5"
+                placeholder="请选择模版"
+                :size="size"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+                @popupScroll="templateScroll"
+              >
+              </a-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="footer">
+        <div class="btn">
+          <a-button v-on:click="createProject" type="primary" class="btn1"
+            >确定</a-button
+          >
+          <a-button @click="backPage" class="btn2">取消</a-button>
+        </div>
+      </div>
+    </div>
+  </template>
+  <script>
+  import { reactive, toRefs, ref } from "vue";
+  import { message } from "ant-design-vue";
+  import { useRouter, useRoute } from "vue-router";
+  import dayjs from "dayjs";
+  import * as api from "../../api/index";
+  import { storage } from "../../api/storage";
+  import { toDate } from "../../api/method";
+  
+  export default {
+    name: "projectAdd",
+    setup() {
+      // 编辑页面跳转过来时候，自动填充表格
+      const routers = useRoute();
+      const isEdit = ref(false);
+      let peojectID = "";
+  
+      if (routers.query.projectId) {
+        storage.set("projectAddId", routers.query.projectId);
+        isEdit.value = true;
+        peojectID = routers.query.projectId;
+        // 需要编辑
+        api
+          .getProjectDetail({ projectId: routers.query.projectId })
+          .then((res) => {
+            if (res.status == 200 && res.data.code == 200) {
+              let info = res.data.data.projectInfo;
+              console.log(info);
+              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+              projectName.value = info.name;
+              state.classifySelect = classifyList.value[1]; // info.category
+              imageUrl.value = info.picUrl;
+  
+              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+              state.rangevalue = [
+                dayjs(start, "YYYY/MM/DD"),
+                dayjs(end, "YYYY/MM/DD"),
+              ];
+  
+              let manageName = info.manager.split(",");
+              let manageValue = info.managerId.split(",");
+              let optionsManage = [];
+              for (let i = 0; i < manageName.length; i++) {
+                let obj = {
+                  label: manageName[i],
+                  value: manageValue[i],
+                };
+                optionsManage.push(obj);
+              }
+              console.log(optionsManage);
+              state.classifySelect1 = optionsManage;
+              state.classifySelect2 =
+                classifyList2.value[info.sourceBelongId - 1];
+              remark.value = info.remark;
+              state.checked = info.boeFlag ? info.boeFlag : false;
+              state.classifySelect3 = classifyList3.value[info.level];
+              state.classifySelect4 = classifyList4.value[info.systemId - 1];
+              state.checked1 = info.boeFlag ? info.boeFlag : false;
+              // fileList1.value = info.attach.split(",");
+  
+              projectType = 1;
+              picUrl = info.picUrl;
+              beginTime = Number(info.beginTime / 1000);
+              endTime = Number(info.endTime / 1000);
+              manager = info.manager;
+              managerId = info.managerId;
+              sourceBelongIdC = Number(info.sourceBelongId);
+              courseSyncFlag = info.courseSyncFlag;
+              levels = info.level;
+              systemid = info.systemId;
+              boeFlag = info.boeFlag;
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
+        if (storage.get("projectAddId")) {
+          isEdit.value = true;
+          peojectID = storage.get("projectAddId");
+          // 需要编辑
+          api
+            .getProjectDetail({ projectId: storage.get("projectAddId") })
+            .then((res) => {
+              if (res.status == 200 && res.data.code == 200) {
+                let info = res.data.data.projectInfo;
+                console.log("我是从本地存储获取的id", info);
+                projectName.value = info.name;
+                state.classifySelect = classifyList.value[1]; // info.category
+                imageUrl.value = info.picUrl;
+  
+                let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+                let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+                state.rangevalue = [
+                  dayjs(start, "YYYY/MM/DD"),
+                  dayjs(end, "YYYY/MM/DD"),
+                ];
+  
+                let manageName = info.manager.split(",");
+                let manageValue = info.managerId.split(",");
+                let optionsManage = [];
+                for (let i = 0; i < manageName.length; i++) {
+                  let obj = {
+                    label: manageName[i],
+                    value: manageValue[i],
+                  };
+                  optionsManage.push(obj);
+                }
+                console.log(optionsManage);
+                state.classifySelect1 = optionsManage;
+                state.classifySelect2 =
+                  classifyList2.value[info.sourceBelongId - 1];
+                remark.value = info.remark;
+                state.checked = info.boeFlag ? info.boeFlag : false;
+                state.classifySelect3 = classifyList3.value[info.level];
+                state.classifySelect4 = classifyList4.value[info.systemId - 1];
+                state.checked1 = info.boeFlag ? info.boeFlag : false;
+  
+                projectType = 1;
+                picUrl = info.picUrl;
+                beginTime = Number(info.beginTime / 1000);
+                endTime = Number(info.endTime / 1000);
+                manager = info.manager;
+                managerId = info.managerId;
+                sourceBelongIdC = Number(info.sourceBelongId);
+                courseSyncFlag = info.courseSyncFlag;
+                levels = info.level;
+                systemid = info.systemId;
+                boeFlag = info.boeFlag;
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+        }
+      }
+  
+      const backPage = () => {
+        storage.remove("projectAddId");
+        setTimeout(() => {
+          router.push({
+            path: "/libraryAdd",
+          });
+        }, 400);
+      };
+  
+      const router = useRouter();
+      const state = reactive({
+        classifySelect: null,
+        classifySelectId: null,
+        checked: false,
+        checked1: false,
+        valueE: null,
+        valueE1: null,
+        valueE2: null,
+        classifySelect1: [],
+        classifySelect2: [],
+        classifySelect3: [],
+        classifySelect4: [],
+        rangevalue: [],
+  
+        currentPage: 1, //当前页
+        tableDataTotal: -1, //模版列表总数
+        pageSize: 10, //每页10条数据
+        totalPages: 0, //总页数
+        viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+      });
+  
+      const projectName = ref("");
+  
+      const classifyList = ref([
+        { value: 1, label: "管理者" },
+        { value: 2, label: "领军者" },
+        { value: 3, label: "产业人" },
+      ]);
+  
+      let projectType = "";
+  
+      const classificationChange = (value) => {
+        console.log(`selected ${value}`);
+        projectType = value;
+      };
+  
+      function getBase64(img, callback) {
+        const reader = new FileReader();
+        reader.addEventListener("load", () => callback(reader.result));
+        reader.readAsDataURL(img);
+      }
+  
+      const fileList = ref([]);
+      const fileList1 = ref([]);
+      const loading = ref(false);
+      const imageUrl = ref("");
+      let picUrl = "";
+  
+      const handleChange = (info) => {
+        if (info.file.status === "uploading") {
+          loading.value = true;
+          return;
+        }
+        if (info.file.status === "done") {
+          console.log("上传图片返回的信息 %o", info);
+          picUrl = info.file.response.data;
+          // Get this url from response in real world.
+          getBase64(info.file.originFileObj, (base64Url) => {
+            imageUrl.value = base64Url;
+            loading.value = false;
+          });
+        }
+        if (info.file.status === "error") {
+          loading.value = false;
+          message.error("upload error");
+        }
+      };
+  
+      let uplodaFileCount = false;
+  
+      let attach = "";
+      let attachData = "";
+      const handleChange1 = (info) => {
+        if (info.file.status === "uploading") {
+          loading.value = true;
+          return;
+        }
+        if (info.file.status === "done") {
+          console.log(
+            "上传附件返回的信息 %o",
+            info,
+            info.fileList.length,
+            uplodaFileCount
+          );
+  
+          let attachStr = "";
+          attachData = info.fileList;
+          for (let i = 0; i < attachData.length; i++) {
+            if (attachData.length - 1 == i) {
+              attachStr += attachData[i].response.data;
+            } else {
+              attachStr += attachData[i].response.data + ",";
+            }
+          }
+          console.log(attachStr);
+          attach = attachStr;
+  
+          if (info.fileList.length > 5) {
+            uplodaFileCount = true;
+          } else {
+            uplodaFileCount = false;
+          }
+        }
+        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 beforeUpload1 = () => {
+        return new Promise((resovle, reject) => {
+          if (uplodaFileCount) {
+            message.info("上传文件数量已达最大数量");
+            return reject(false);
+          }
+          return resovle(true);
+        });
+      };
+  
+      let beginTime = "";
+      let endTime = "";
+      const dateFormatList = ["YYYY/MM/DD"];
+  
+      const onRangeChange = (value, dateString) => {
+        console.log("Selected Time: ", value);
+        // 项目时间选择函数
+        console.log("Formatted Selected Time: ", dateString);
+        console.log(
+          "Formatted Selected TimeStamp",
+          new Date(dateString[0]).getTime()
+        );
+        beginTime = new Date(dateString[0]).getTime() / 1000;
+        endTime = new Date(dateString[1]).getTime() / 1000;
+      };
+  
+      // 项目经理 后续接口调用
+      const classifyList1 = ref([
+        { value: 1, label: "李俊国" },
+        { value: 2, label: "将小米" },
+        { value: 3, label: "刘孟君" },
+      ]);
+  
+      let manager = "";
+      let managerId = "";
+      const classificationChange1 = (key, options) => {
+        console.log(`selected ${key}`, options);
+        let mstr = "";
+        let midstr = "";
+        for (let i = 0; i < key.length; i++) {
+          if (key.length - 1 !== i) {
+            midstr += key[i] + ",";
+            mstr += classifyList1.value[i].label + ",";
+          } else {
+            midstr += key[i];
+            mstr += classifyList1.value[i].label;
+          }
+        }
+        console.log(mstr, midstr);
+        state.classifySelect1 = options;
+        let newoptions = [];
+        for (let i = 0; i < state.classifySelect1.length; i++) {
+          if (state.classifySelect1[i].value) {
+            newoptions.push(state.classifySelect1[i]);
+          }
+        }
+        state.classifySelect1 = newoptions;
+        manager = mstr;
+        managerId = midstr;
+      };
+  
+      // 资源归属 sourceBelongId 后续给接口
+      const classifyList2 = ref([
+        { value: 1, label: "项目一" },
+        { value: 2, label: "项目二" },
+        { value: 3, label: "项目三" },
+      ]);
+  
+      let sourceBelongIdC = "";
+      const classificationChange2 = (key) => {
+        console.log(`selected ${key}`, classifyList2);
+        sourceBelongIdC = key;
+      };
+  
+      // 项目级别
+      const classifyList3 = ref([
+        { value: 1, label: "集团级" },
+        { value: 2, label: "组织级" },
+        { value: 3, label: "现地级" },
+        { value: 4, label: "部门级" },
+      ]);
+  
+      let levels = "";
+      const classificationChange3 = (key) => {
+        console.log(`selected ${key}`, classifyList3);
+        levels = key;
+      };
+  
+      // 培训体系
+      const classifyList4 = ref([
+        { value: 1, label: "集团级" },
+        { value: 2, label: "组织级" },
+        { value: 3, label: "现地级" },
+        { value: 4, label: "部门级" },
+      ]);
+  
+      let systemid = "";
+      const classificationChange4 = (key) => {
+        console.log(`selected ${key}`, classifyList4);
+        systemid = key;
+      };
+  
+      // 模版
+      const classifyList5 = ref([
+        // { value: 1, label: "模版一" },
+        // { value: 2, label: "模版二" },
+        // { value: 3, label: "模版三" },
+        // { value: 4, label: "模版四" },
+      ]);
+      const classificationChange5 = (key) => {
+        console.log(`selected ${key}`, classifyList5.value);
+        //获取模版信息
+        let obj = {
+          projectId: Number(key),
+        };
+        api
+          .getProjectDetail(obj)
+          .then((res) => {
+            console.log("获取项目详情", res);
+            if (res.status === 200) {
+              let info = res.data.data.projectInfo;
+              console.log(info);
+              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+              projectName.value = info.name;
+              state.classifySelect = classifyList.value[1]; // info.category
+              imageUrl.value = info.picUrl;
+  
+              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+              state.rangevalue = [
+                dayjs(start, "YYYY/MM/DD"),
+                dayjs(end, "YYYY/MM/DD"),
+              ];
+  
+              let manageName = info.manager.split(",");
+              let manageValue = info.managerId.split(",");
+              let optionsManage = [];
+              for (let i = 0; i < manageName.length; i++) {
+                let obj = {
+                  label: manageName[i],
+                  value: manageValue[i],
+                };
+                optionsManage.push(obj);
+              }
+              console.log(optionsManage);
+              state.classifySelect1 = optionsManage;
+              state.classifySelect2 =
+                classifyList2.value[info.sourceBelongId - 1];
+              remark.value = info.remark;
+              state.checked = info.boeFlag ? info.boeFlag : false;
+              state.classifySelect3 = classifyList3.value[info.level];
+              state.classifySelect4 = classifyList4.value[info.systemId - 1];
+              state.checked1 = info.boeFlag ? info.boeFlag : false;
+              // fileList1.value = info.attach.split(",");
+  
+              projectType = 1;
+              picUrl = info.picUrl;
+              beginTime = Number(info.beginTime / 1000);
+              endTime = Number(info.endTime / 1000);
+              manager = info.manager;
+              managerId = info.managerId;
+              sourceBelongIdC = Number(info.sourceBelongId);
+              courseSyncFlag = info.courseSyncFlag;
+              levels = info.level;
+              systemid = info.systemId;
+              boeFlag = info.boeFlag;
+            }
+          })
+          .catch((err) => {
+            console.log("获取详情失败", err);
+          });
+      };
+      //获取模版列表
+      const getTemplate = () => {
+        let obj = {
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
+          // projectId:id?id:''
+        };
+        api
+          .getProjectList(obj)
+          .then((res) => {
+            console.log("获取模版列表", res);
+            state.totalPages = Number(res.data.data.pages);
+            if (res.status === 200) {
+              let arr = res.data.data.rows;
+              let array = classifyList5.value;
+              arr.map((value) => {
+                let obj = {
+                  value: value.projectId,
+                  label: value.name,
+                };
+                array.push(obj);
+              });
+              classifyList5.value = array;
+            }
+          })
+          .catch((err) => {
+            console.log("获取模版列表失败", err);
+          });
+      };
+      getTemplate();
+      //模版滚动加载信息
+      const templateScroll = (e) => {
+        // console.log("滚动", e, b);
+        const { target } = e;
+        const scrllHeight = target.scrollHeight - target.scrollTop;
+        const clientHeight = target.clientHeight;
+        // console.log("scrllHeight", scrllHeight, clientHeight);
+        if (scrllHeight === 0 && clientHeight === 0) {
+          state.currentPage = 1;
+        } else if (scrllHeight - clientHeight == 0) {
+          // 下拉到底部时
+          if (state.currentPage < state.totalPages) {
+            // 如果滑到底部，则加载下一页
+            state.currentPage++;
+            getTemplate();
+          }
+        }
+      };
+  
+      // 项目说明
+      const remark = ref("");
+  
+      let courseSyncFlag = 0;
+      const changeChecked = () => {
+        console.log(state.checked);
+        state.checked ? (state.checked = false) : (state.checked = true);
+        courseSyncFlag = state.checked ? 1 : 0;
+      };
+  
+      let boeFlag = 0;
+      const changeChecked1 = () => {
+        console.log(state.checked1);
+        state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+        boeFlag = state.checked1 ? 1 : 0;
+      };
+  
+      const removeFile = (file) => {
+        const index = fileList1.value.indexOf(file);
+        const newFileList = fileList1.value.slice();
+        newFileList.splice(index, 1);
+        fileList1.value = newFileList;
+  
+        let attachStr = "";
+        if (newFileList.length == 0) {
+          attachStr = "";
+        }
+        for (let i = 0; i < fileList1["value"].length; i++) {
+          console.log(fileList1["value"][i].response.data);
+          if (fileList1["value"].length - 1 == i) {
+            attachStr += fileList1["value"][i].response.data;
+          } else {
+            attachStr += fileList1["value"][i].response.data + ",";
+          }
+        }
+        attach = attachStr;
+      };
+  
+      const errorMsgs = {
+        name: "请输入项目名称",
+        category: "请选择项目分类",
+        picUrl: "请上传项目封面图",
+        beginTime: "请选择项目开始时间",
+        endTime: "请选择项目结束时间",
+        manager: "请选择项目经理",
+        managerId: "请选择项目经理",
+        sourceBelongId: "请选择资源归属",
+        level: "请填写项目级别",
+        systemId: "请填写项目培训体系",
+        boeFlag: "请选择是否BOE实施",
+      };
+  
+      const createProject = () => {
+        console.log("我是否要编辑项目", isEdit.value);
+        if (isEdit.value) {
+          console.log("我要编辑项目", peojectID);
+          let obj = {
+            projectId: Number(peojectID),
+            name: projectName["value"],
+            category: projectType,
+            picUrl: picUrl,
+            beginTime: beginTime,
+            endTime: endTime,
+            manager: manager,
+            managerId: managerId,
+            sourceBelongId: sourceBelongIdC,
+            remark: remark["value"],
+            courseSyncFlag: courseSyncFlag,
+            level: levels,
+            systemId: systemid,
+            boeFlag: boeFlag,
+            attach: attach,
+            type: 3,
+            templateId: 0,
+            parentId: 0,
+            notice: "",
+            noticeFlag: 0,
+            status: 0,
+          };
+  
+          console.log(obj);
+  
+          for (let i in errorMsgs) {
+            console.log(obj[i]);
+            if (obj[i] === "" || obj[i] === undefined) {
+              message.destroy();
+              message.warning(errorMsgs[i]);
+              return;
+            }
+          }
+  
+          api
+            .createProject(obj)
+            .then((res) => {
+              console.log(res);
+              if (res.status == 200 && res.data.code == 200) {
+                message.destroy();
+                message.success("编辑成功");
+                setTimeout(() => {
+                  router.push({
+                    path: "/projectmanage",
+                  });
+                }, 1000);
+              } else {
+                message.destroy();
+                message.error("编辑失败，请检查当前网络状态。");
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+              message.destroy();
+              message.error("编辑失败，请检查当前网络状态。");
+            });
+        } else {
+          let obj = {
+            name: projectName["value"],
+            category: projectType,
+            picUrl: picUrl,
+            beginTime: beginTime,
+            endTime: endTime,
+            manager: manager,
+            managerId: managerId,
+            sourceBelongId: sourceBelongIdC,
+            remark: remark["value"],
+            courseSyncFlag: courseSyncFlag,
+            level: levels,
+            systemId: systemid,
+            boeFlag: boeFlag,
+            attach: attach,
+            type: 3,
+            templateId: 10,
+            parentId: 0,
+            notice: "",
+            noticeFlag: 0,
+            status: 0,
+          };
+          console.log("提交的数据格式 %o", obj);
+          for (let i in errorMsgs) {
+            console.log(obj[i]);
+            if (obj[i] === "" || obj[i] === undefined) {
+              message.destroy();
+              message.warning(errorMsgs[i]);
+              return;
+            }
+          }
+  
+          api
+            .createProject(obj)
+            .then((res) => {
+              console.log(res);
+              if (res.status == 200 && res.data.code == 200) {
+                message.destroy();
+                message.success("创建成功");
+                setTimeout(() => {
+                  router.push({
+                    path: "/taskpage",
+                    query: { id: res.data.data.projectId },
+                  });
+                }, 1000);
+              } else {
+                message.destroy();
+                message.error("创建失败，请检查当前网络状态。");
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+              message.destroy();
+              message.error("创建失败，请检查当前网络状态。");
+            });
+        }
+      };
+  
+      return {
+        ...toRefs(state),
+        projectName,
+        classifyList,
+        classificationChange,
+        classificationChange1,
+        classificationChange2,
+        classificationChange3,
+        classificationChange4,
+        classificationChange5,
+        fileList,
+        fileList1,
+        loading,
+        imageUrl,
+        handleChange,
+        handleChange1,
+        beforeUpload,
+        beforeUpload1,
+        onRangeChange,
+        classifyList1,
+        classifyList2,
+        classifyList3,
+        classifyList4,
+        classifyList5,
+        remark,
+        changeChecked,
+        changeChecked1,
+        uplodaFileCount,
+        createProject,
+        removeFile,
+  
+        isEdit,
+        backPage,
+        dateFormatList,
+  
+        templateScroll,
+      };
+    },
+  };
+  </script>
+  <style lang="scss">
+  .projectAdd {
+    width: 100%;
+    // height: inherit;
+    // flex: 1;
+    // flex-shrink: 0;
+    // overflow-y: auto;
+  
+    .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;
+        }
+      }
+    }
+  
+    // 修改 antd upload 样式
+    .ant-upload {
+      border-width: 0px;
+    }
+  
+    .content {
+      display: flex;
+  
+      .main {
+        width: 50%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        //justify-content: center;
+        float: left;
+        border-right: 1px solid rgba(153, 155, 163, 0.3);
+  
+        .name {
+          width: 78%;
+          // 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;
+            }
+          }
+  
+          .d {
+            margin-top: 8px;
+            font-size: 25px;
+            color: #ff4e4e;
+          }
+  
+          .box {
+            position: relative;
+            margin-left: 14px;
+  
+            .box1 {
+              position: absolute;
+              left: 50%;
+              top: 50%;
+              width: 50px;
+              margin-left: -25px;
+              margin-top: -5px;
+              border-top: 2px solid rgba(78, 166, 255, 1);
+            }
+  
+            .box2 {
+              position: absolute;
+              left: 50%;
+              top: 50%;
+              height: 50px;
+              //margin-left: -5px;
+              margin-top: -25px;
+              border-left: 2px solid rgba(78, 166, 255, 1);
+            }
+          }
+  
+          .inname {
+            color: #6f6f6f;
+            font-size: 14px;
+            margin-left: 7px;
+          }
+  
+          .in {
+            margin-left: 14px;
+            flex: 1;
+  
+            // .ant-radio-wrapper {
+            // }
+            .ant-input-textarea-show-count {
+              position: relative;
+              height: 88px;
+            }
+  
+            .ant-input-textarea-show-count::after {
+              position: absolute;
+              right: 10px;
+              bottom: 0px;
+            }
+  
+            .ant-input {
+              border-radius: 8px;
+              // height: 120%;
+              width: 100%;
+              height: 40px;
+            }
+  
+            .ant-input-affix-wrapper {
+              padding: 0 11px;
+              border-radius: 8px;
+            }
+  
+            .ant-select-selector {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              // height: 40px;
+            }
+          }
+  
+          .filebox {
+            margin-left: 14px;
+            flex: 1;
+  
+            .fileimg {
+              width: 15px;
+              height: 15px;
+              margin-right: 6px;
+            }
+  
+            .filetext {
+              font-size: 14px;
+              font-weight: 400;
+              color: #4ea6ff;
+              line-height: 36px;
+            }
+  
+            .support {
+              font-size: 14px;
+              font-weight: 400;
+              color: #999ba3;
+              line-height: 36px;
+              margin-top: 8px;
+              word-break: break-all;
+            }
+          }
+        }
+  
+        .name2 {
+          display: flex;
+          align-items: flex-start;
+  
+          .ant-input-textarea {
+            .ant-input {
+              height: 88px;
+            }
+          }
+        }
+      }
+  
+      .template {
+        width: 50%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        //justify-content: center;
+        float: right;
+  
+        .name {
+          width: 78%;
+          // background-color: lightcoral;
+          display: flex;
+          margin-top: 20px;
+          align-items: center;
+          height: 40px;
+  
+          // border: 1px solid black;
+          .d {
+            margin-top: 8px;
+            font-size: 25px;
+            color: #ff4e4e;
+          }
+  
+          .inname {
+            color: #6f6f6f;
+            font-size: 14px;
+            margin-left: 7px;
+            width: 65px;
+          }
+  
+          .in {
+            margin-left: 14px;
+            width: 81%;
+  
+            .ant-input {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              height: 40px;
+            }
+  
+            .ant-select-selector {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              height: 40px;
+            }
+          }
+        }
+      }
+    }
+  
+    .footer {
+      width: 100%;
+      margin-top: 31px;
+      margin-bottom: 14px;
+      padding-bottom: 20px;
+  
+      .btn {
+        display: flex;
+        justify-content: center;
+  
+        .btn1 {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 100px;
+          height: 40px;
+          border-radius: 8px;
+          background: #409eff;
+          color: #ffffff;
+          margin-right: 14px;
+        }
+  
+        .btn2 {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: 100px;
+          height: 40px;
+          border-radius: 8px;
+          border: 1px solid #409eff;
+          background: #ffffff;
+          color: #409eff;
+        }
+      }
+  
+      .text {
+        color: rgba(153, 155, 163, 1);
+        font-size: 14px;
+        margin-left: 223px;
+      }
+    }
+  }
+  </style>
+  
\ No newline at end of file

From 97a8e6f4c681821df1ad4e4ce83074977609ae67 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 17 Nov 2022 21:25:09 +0800
Subject: [PATCH 65/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E5=8D=A1=E5=8F=8A=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                            |    2 +-
 src/api/indexStage.js                        |   12 +-
 src/assets/images/leveladd/edit1.png         |  Bin 0 -> 410 bytes
 src/assets/scss/common.scss                  |   11 +
 src/components/BreadCrumb.vue                |   52 +
 src/components/Modals/projSet.vue            |    2 +-
 src/components/NavLeft.vue                   |    8 +-
 src/views/courselibrary/CourseManage.vue     |  551 +------
 src/views/courselibrary/CoursewareManage.vue |    8 +-
 src/views/learningpath/LevelAddDetail.vue    | 1548 ++++++++++--------
 src/views/projectcenter/ClassAdd.vue         |    6 +-
 src/views/projectcenter/LibraryAdd.vue       |    4 +-
 src/views/projectcenter/ProjectAdd.vue       |    9 +-
 src/views/projectcenter/ProjectManage.vue    |   46 +-
 src/views/projectcenter/SonProject.vue       |    6 +-
 src/views/projectcenter/TaskAdd.vue          | 1501 ++++++++++-------
 src/views/projectcenter/TaskPage.vue         |  159 +-
 17 files changed, 1977 insertions(+), 1948 deletions(-)
 create mode 100644 src/assets/images/leveladd/edit1.png

diff --git a/src/api/index1.js b/src/api/index1.js
index b8f120f7..d7517673 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-10 11:41:52
+ * @LastEditTime: 2022-11-17 15:41:45
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/api/indexStage.js b/src/api/indexStage.js
index 1e6a2587..a39355b9 100644
--- a/src/api/indexStage.js
+++ b/src/api/indexStage.js
@@ -1,4 +1,14 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-17 21:20:05
+ * @FilePath: /fe-manage/src/api/indexStage.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import http from "./config";
 
 //添加阶段
-export const editStage = (obj) => http.post('/admin/project/editStage', obj);
\ No newline at end of file
+export const editStage = (obj) => http.post('/admin/project/editStage', obj);
+// 删除阶段
+export const deleteStage = (obj) => http.delete('/admin/project/deleteStage',{params:obj});
\ No newline at end of file
diff --git a/src/assets/images/leveladd/edit1.png b/src/assets/images/leveladd/edit1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e319e324dc5f650105a482cb7eb0825a02335f3b
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$R7pfZR5(wilD$d;Q4odCvG5HP3tzy_!crf=U3UW_f}K_h7AlE~f6-tf{$Pl~
zLeq$yV0Tw{t$h(IOAE0K=14X%*({q7$W)hm?|gI4%n$<x>-qAX9KdV>>l>qEBb=&K
zqi+h_TL|m444VK~06qae0=4?N5ghu$&v2QG&%ggy3fyA|Cjg#knWZQoL(5$Ea@0yD
zikvm+utvi|sNj^ANwN_#<)^ZMasX~<na!5SHb4bh-eHmgy}ElK&LEX(dmGU|5e3Nr
z`Kbdyc>pC^W-DHxCqRL_4dF6gS;5>iG_+8+(iI@z*#}sNdv5mQ9MEoTjBN{gOU<CB
zcS!fNy|uV(`R)#Yi|zn_ejKV!()L~wo7%M22@vwM%~3y_E#Juiyov+Tv`w)uK;SGx
ze24=+K-__7uW~n<v;uG<3Mc{SSdc!HRA`yiaEyb*9|MK95f}~lf&c&j07*qoM6N<$
Ef^7$@B>(^b

literal 0
HcmV?d00001

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 09f462c8..a8adc8b1 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -437,6 +437,17 @@ textarea {
   }
 }
 
+.ant-modal{
+  .modalHeader{
+    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+  }
+  .top{
+    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+  }
+  .del_header{
+    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+  }
+}
 //弹窗--------------------------------------------------------
 
 //loading--------------------------------------------------------
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 2abfc972..c4cb108c 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -273,6 +273,58 @@ export default {
             },
           ];
         }
+        if (
+          n.indexOf("/coursereviewed") !== -1 ||
+          n.indexOf("/CourseReiewed") !== -1
+        ) {
+          state.list = [
+            {
+              name: "审核管理",
+            },
+            {
+              name: "已审核课程",
+            },
+          ];
+        }
+        if (
+          n.indexOf("/coursereviewedn") !== -1 ||
+          n.indexOf("/CourseReiewedN") !== -1
+        ) {
+          state.list = [
+            {
+              name: "审核管理",
+            },
+            {
+              name: "待审核课程",
+            },
+          ];
+        }
+        if (
+          n.indexOf("/projectreviewed") !== -1 ||
+          n.indexOf("/ProjectReviewed") !== -1
+        ) {
+          state.list = [
+            {
+              name: "审核管理",
+            },
+            {
+              name: "已审核项目",
+            },
+          ];
+        }
+        if (
+          n.indexOf("/projectreviewedn") !== -1 ||
+          n.indexOf("/ProjectReviewedN") !== -1
+        ) {
+          state.list = [
+            {
+              name: "审核管理",
+            },
+            {
+              name: "待审核项目",
+            },
+          ];
+        }
       }
     );
 
diff --git a/src/components/Modals/projSet.vue b/src/components/Modals/projSet.vue
index d41a38c6..92306df8 100644
--- a/src/components/Modals/projSet.vue
+++ b/src/components/Modals/projSet.vue
@@ -180,7 +180,7 @@
                   alt=""
                 />
               </div>
-              <span style="margin-right: 3px">培训体系：</span>
+              <span style="margin-right: 3px">培训分类：</span>
             </div>
             <div class="btnbox">
               <a-input
diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index b5dbbaeb..5f84d414 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -62,7 +62,7 @@
                 circle: selectedKeys[0] === 'sub10-3' ? false : true,
               }"
             ></span>
-            <router-link to="/projecreviewedn">待审核项目</router-link>
+            <router-link to="/projectreviewedn">待审核项目</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-4">
             <span
@@ -71,7 +71,7 @@
                 circle: selectedKeys[0] === 'sub10-4' ? false : true,
               }"
             ></span>
-            <router-link to="/projecreviewed">已审核项目</router-link>
+            <router-link to="/projectreviewed">已审核项目</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -307,13 +307,13 @@ export default {
           pagename: "已审核课程",
         },
         {
-          href: "/projectviewedn",
+          href: "/projectreviewedn",
           openKeys: "sub10",
           selectedKeys: "sub10-3",
           pagename: "待审核项目",
         },
         {
-          href: "/projectviewed",
+          href: "/projectrrviewed",
           openKeys: "sub10",
           selectedKeys: "sub10-4",
           pagename: "已审核项目",
diff --git a/src/views/courselibrary/CourseManage.vue b/src/views/courselibrary/CourseManage.vue
index 2a5bf0bc..fb6beea2 100644
--- a/src/views/courselibrary/CourseManage.vue
+++ b/src/views/courselibrary/CourseManage.vue
@@ -1,458 +1,40 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-17 16:27:22
+ * @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <!-- 课件管理页面 -->
 <template>
   <div class="courseManage">
-    <!-- 搜索框及按钮 -->
-    <div class="filter">
-      <div class="filterItems">
-        <div class="select">
-          <a-select
-            v-model:value="projectName"
-            style="width: 270px"
-            placeholder="请输入项目名称"
-            :options="projectNameList"
-            @change="selectProjectName"
-            allowClear
-            showSearch
-          ></a-select>
-        </div>
-        <div class="select">
-          <a-select
-            v-model:value="projectName"
-            style="width: 270px"
-            placeholder="请输入项目经理"
-            :options="projectNameList"
-            @change="selectProjectName"
-            allowClear
-            showSearch
-          ></a-select>
-        </div>
-        <div class="select">
-          <a-select
-            v-model:value="projectName"
-            style="width: 270px"
-            placeholder="请选择状态"
-            :options="projectNameList"
-            @change="selectProjectName"
-            allowClear
-            showSearch
-          ></a-select>
-        </div>
-        <div class="select">
-          <a-date-picker
-            v-model="selectTime"
-            type="date"
-            placeholder="创建时间"
-            style="width: 270px"
-          />
-        </div>
-      </div>
-      <div class="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 class="btn btn3">
-          <div class="search"></div>
-          <div class="btnText">创建项目</div>
-        </div>
-      </div>
-    </div>
-    <!-- 搜索框及按钮 -->
-    <!-- 表格 -->
-    <div class="tableBox">
-      <a-table
-        :columns="columns"
-        :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
-        :scroll="{ x: 700, y: 800 }"
-        expandRowByClick="true"
-        @expand="expandTable"
-        :pagination="{
-          showSizeChanger: true,
-          showQuickJumper: true,
-          hideOnSinglePage: true,
-          pageSizeOptions: [],
-          pageSize: pageSize,
-          current: currentPage,
-          total: tableDataTotal,
-          onChange: (page, pageSize) => {
-            currentPage = page;
-            // console.log('page', page)
-            // 加翻页查找代码
-            // 	this.setState({
-            // 		currentPage: page,
-            // 	}, () => {
-            // 		this.getMilitaryDeployment()
-            // 	})
-          },
-        }"
-      />
-    </div>
-    <!-- 表格 -->
+   <iframe
+          id="iframe"
+          style="width:100%l;height:100%"
+          src="https://u-pre.boe.com/pc/iframe/course/coursewares"
+          name="myframe"
+        ></iframe>
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted, ref } from "vue";
-const columns = [
-  {
-    title: "项目名称",
-    dataIndex: "projectName",
-    key: "projectName",
-    width: 280,
-    // align: "center",
-    ellipsis: true,
-    // scopedSlots: { customRender: "action" }, //引入的插槽
-    // customRender: (text, record) => {
-    //   console.log(text, record);
-    //   return <span>{text.text}</span>;
-    // },
-  },
-  {
-    title: "项目经理",
-    dataIndex: "manager",
-    key: "manager",
-    width: 100,
-    align: "center",
-  },
-  {
-    title: "状态",
-    dataIndex: "state",
-    // width: "30%",
-    key: "state",
-    width: 100,
-    align: "center",
-  },
-  {
-    title: "创建人",
-    dataIndex: "creater",
-    // width: "30%",
-    key: "creater",
-    width: 100,
-    align: "center",
-  },
-  {
-    title: "创建时间",
-    dataIndex: "time",
-    key: "time",
-    width: 180,
-    align: "center",
-  },
-  {
-    title: "操作",
-    dataIndex: "opacation",
-    key: "opacation",
-    width: 300,
-    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);
-  },
-});
+import { reactive, toRefs, onMounted } from "vue";
+
 export default {
   name: "CourseManage",
 
   setup() {
     const state = reactive({
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectName: null,
-      selectTime: null,
-
-      tableData: [
-        {
-          key: 1,
-          projectName:
-            "管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-          children: [
-            {
-              key: 5,
-              projectName: "管理者进阶5",
-              manager: "黄华  刘俊",
-              state: "草稿",
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-              children: [
-                {
-                  key: 7,
-                  projectName:
-                    "管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-                  manager: "黄华  刘俊",
-                  state: "草稿",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
-                },
-                {
-                  key: 8,
-                  projectName: "管理者进阶8",
-                  manager: "黄华  刘俊",
-                  state: "草稿",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
-                },
-              ],
-            },
-            {
-              key: 6,
-              projectName: "管理者进阶6",
-              manager: "黄华  刘俊",
-              state: "草稿",
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-            },
-          ],
-        },
-        {
-          key: 2,
-          projectName: "管理者进阶2",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 3,
-          projectName: "管理者进阶3",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-          hasChildren: true,
-          children: [
-            {
-              key: 35,
-              projectName: "管理者进阶35",
-              manager: "黄华  刘俊",
-              state: "草稿",
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-              children: [
-                {
-                  key: 37,
-                  projectName: "管理者进阶37",
-                  manager: "黄华  刘俊",
-                  state: "草稿",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
-                },
-                {
-                  key: 38,
-                  projectName: "管理者进阶38",
-                  manager: "黄华  刘俊",
-                  state: "草稿",
-                  creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
-                },
-              ],
-            },
-            {
-              key: 36,
-              projectName: "管理者进阶36",
-              manager: "黄华  刘俊",
-              state: "草稿",
-              creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
-            },
-          ],
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶4",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶5",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-        {
-          key: 4,
-          projectName: "管理者进阶",
-          manager: "黄华  刘俊",
-          state: "草稿",
-          creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
-        },
-      ],
-      currentPage: 1,
-      tableDataTotal: 20,
-      pageSize: 10,
+    
     });
 
     onMounted(() => {
       // console.log("执行");
     });
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-    };
-    const expandTable = (e, a) => {
-      console.log("惦记了");
-      console.log("e", e, a);
-    };
+   
     return {
       ...toRefs(state),
-      columns,
-      rowSelection,
-      selectProjectName,
-      expandTable,
+     
     };
   },
 };
@@ -463,99 +45,6 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
-  .filter {
-    margin-left: 38px;
-    margin-right: 38px;
-    margin-top: 30px;
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    .filterItems {
-      display: flex;
-      flex-wrap: wrap;
-      .select {
-        margin-right: 20px;
-        margin-bottom: 20px;
-      }
-    }
-    .btns {
-      display: flex;
-      // flex-wrap: wrap;
-      .btn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: rgba(64, 158, 255, 0);
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-        .search {
-          background-size: 100%;
-        }
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: rgba(64, 158, 255, 1);
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-      .btn1 {
-        .search {
-          width: 15px;
-          height: 17px;
-          background-image: url("../../assets/images/courseManage/search1.png");
-        }
-      }
-      .btn2 {
-        .search {
-          width: 16px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
-        }
-      }
-      .btn3 {
-        margin-right: 0px;
-        .search {
-          width: 17px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/add1.png");
-        }
-      }
-      .btn1:hover {
-        background: rgba(64, 158, 255, 1);
-        .search {
-          background-image: url("../../assets/images/courseManage/search0.png");
-        }
-        .btnText {
-          color: #ffffff;
-        }
-      }
-      .btn2:hover {
-        background: rgba(64, 158, 255, 1);
-        .search {
-          background-image: url("../../assets/images/courseManage/reset0.png");
-        }
-        .btnText {
-          color: #ffffff;
-        }
-      }
-      .btn3:hover {
-        background: rgba(64, 158, 255, 1);
-        .search {
-          background-image: url("../../assets/images/courseManage/add0.png");
-        }
-        .btnText {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-  .tableBox {
-    margin: 20px 38px 30px;
-  }
+ 
 }
 </style>
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 4887d1a8..3a75c185 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -458,7 +458,7 @@
                         alt=""
                       />
                     </div>
-                    <span style="margin-right: 14px">内容分类</span>
+                    <span style="margin-right: 14px">课程分类</span>
                   </div>
                   <div class="item_inp">
                     <div class="select i6_input">
@@ -1738,7 +1738,7 @@ const columns1 = [
     },
   },
   {
-    title: "内容分类",
+    title: "课程分类",
     width: 130,
     dataIndex: "content",
     key: "1",
@@ -3438,10 +3438,6 @@ courseownervisible:false,
       },
     ]);
     const options2 = ref([
-      {
-        value: "value2",
-        label: "请选择内容分类",
-      },
       {
         value: "leadership",
         label: "领导力",
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 918c39d7..2d28506f 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1,14 +1,15 @@
 <template>
   <div class="leveladddetail">
-    <div class="left clearfix">
-      <div class="leftmain">
-        <div class="tit" style="margin-left: 18px">关卡</div>
-        <div class="btn btn3" style="margin-left: 19px">
-          <div class="search"></div>
-          <div class="btnText" @click="showModal">添加关卡</div>
-        </div>
-        <div class="maincon" style="background-color: #fff">
-          <!-- <div
+    <div style="display: flex">
+      <div class="left clearfix">
+        <div class="leftmain">
+          <div class="tit" style="margin-left: 18px">关卡</div>
+          <div class="btn btn3" style="margin-left: 19px">
+            <div class="search"></div>
+            <div class="btnText" @click="showModal()">添加关卡</div>
+          </div>
+          <div class="maincon" style="background-color: #fff">
+            <!-- <div
             class="items"
             :class="{ active: isActive == true }"
             @click="changebgc"
@@ -16,77 +17,77 @@
             :key="item.id"
           > -->
 
-          <draggable
-            v-model="level"
-            chosenClass="chosen"
-            ghostClass="ghost"
-            forceFallback="true"
-            group="stage"
-            animation="500"
-          >
-            <template #item="{ element }">
-              <div
-                class="items"
-                :class="isactive == element.chapterId ? 'active' : ''"
-                @click="changebgc(element.chapterId)"
-              >
-                <div class="items1">
-                  <div class="boxs_left">
-                    <a-popover placement="topLeft" trigger="click">
+            <draggable
+              v-model="level"
+              chosenClass="chosen"
+              ghostClass="ghost"
+              forceFallback="true"
+              group="stage"
+              animation="500"
+            >
+              <template #item="{ element }">
+                <div
+                  class="items"
+                  :class="isactive == element.chapterId ? 'active' : ''"
+                  @click="changebgc(element.chapterId)"
+                >
+                  <div class="items1">
+                    <div class="boxs_left">
+                      <a-popover placement="topLeft" trigger="click">
+                        <template #content>
+                          <div style="width: 130px">
+                            {{ element.remark ? element.remark : "暂无说明" }}
+                          </div>
+                        </template>
+                        <template #title>
+                          <span>关卡说明</span>
+                        </template>
+                        <div class="script">
+                          <span style="font-size: 12px; color: #ffffff"
+                            >说明</span
+                          >
+                        </div>
+                      </a-popover>
+
+                      <div class="imgIcon" @click="showModal(element)"></div>
+                    </div>
+                    <div class="boxs_right">
+                      <div
+                        class="imgIcon"
+                        @click="showDeleteChapter(element.chapterId)"
+                      ></div>
+                    </div>
+                  </div>
+                  <div class="items2">
+                    <a-popover
+                      placement="topLeft"
+                      v-if="element.name.length > 10"
+                    >
                       <template #content>
                         <div style="width: 130px">
-                          {{ element.remark ? element.remark : "暂无说明" }}
+                          {{ element.name }}
                         </div>
                       </template>
-                      <template #title>
-                        <span>关卡说明</span>
-                      </template>
-                      <div class="script">
-                        <span style="font-size: 12px; color: #ffffff"
-                          >说明</span
-                        >
-                      </div>
-                    </a-popover>
-
-                    <div class="imgIcon"></div>
-                  </div>
-                  <div class="boxs_right">
-                    <div
-                      class="imgIcon"
-                      @click="deleteChapter(element.chapterId)"
-                    ></div>
-                  </div>
-                </div>
-                <div class="items2">
-                  <a-popover
-                    placement="topLeft"
-                    v-if="element.name.length > 10"
-                  >
-                    <template #content>
-                      <div style="width: 130px">
-                        {{ element.name }}
-                      </div>
-                    </template>
-                    <!-- <template #title>
+                      <!-- <template #title>
                         <span>关卡说明</span>
                       </template> -->
-                    <div class="nname">
+                      <div class="nname">
+                        {{ element.name }}
+                      </div>
+                    </a-popover>
+                    <div class="nname" v-if="element.name.length <= 10">
                       {{ element.name }}
                     </div>
-                  </a-popover>
-                  <div class="nname" v-if="element.name.length <= 10">
-                    {{ element.name }}
                   </div>
-                </div>
-                <!-- <div class="itemle">
+                  <!-- <div class="itemle">
               <div class="tit">{{ item.remark }}</div>
               <div class="name">{{ item.name }}</div>
             </div> -->
-              </div>
-            </template>
-          </draggable>
+                </div>
+              </template>
+            </draggable>
 
-          <!-- <div
+            <!-- <div
             class="items"
             :class="isactive == index ? 'active' : ''"
             @click="changebgc(index)"
@@ -108,617 +109,650 @@
               <div class="nname">{{ item.name }}</div>
             </div>
           </div> -->
-        </div>
-      </div>
-    </div>
-    <a-modal
-      v-model:visible="modal"
-      centered="true"
-      :footer="null"
-      :closable="clos"
-      wrapClassName="AddLevell"
-    >
-      <div class="header">
-        <div class="headmain">
-          <div class="add">添加关卡</div>
-          <div class="img" style="cursor: pointer" @click="closeModal"></div>
-        </div>
-      </div>
-      <div class="main">
-        <div class="inma">
-          <div class="name">
-            <div class="d" style="margin-top: 2px; margin-right: 2px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="fir">关卡名称：</div>
-            <div class="input">
-              <a-input
-                style="width: 100%"
-                v-model:value="value1"
-                :maxlength="20"
-                placeholder="请输入关卡名称"
-              />
-            </div>
-            <div class="co">{{ value1.length }}/20</div>
-          </div>
-          <div class="name">
-            <div
-              class="d"
-              style="
-                width: 10px;
-                height: 10px;
-                margin-top: 2px;
-                margin-right: 2px;
-              "
-            ></div>
-            <div class="fir">关卡说明：</div>
-            <div class="input">
-              <a-textarea
-                style="width: 100%"
-                v-model:value="value2"
-                :maxlength="100"
-                placeholder="请输入关卡说明"
-                :rows="5"
-              />
-            </div>
-            <div class="co1">{{ value2.length }}/100</div>
-          </div>
-          <div class="btn">
-            <button class="btn1" @click="closeModal">取消</button>
-            <button class="btn2" @click="editChapter">确定</button>
           </div>
         </div>
       </div>
-    </a-modal>
-    <div class="right" :style="{ display: gqxy_hs ? 'block' : 'none' }">
-      <div class="addhead">
-        <div class="filt">
-          <div class="le">
-            <div class="leftimg">
-              <img class="img" :src="picUrl" />
+      <a-modal
+        v-model:visible="modal"
+        centered="true"
+        :footer="null"
+        :closable="clos"
+        wrapClassName="AddLevell"
+         @cancel="closeModal"
+      >
+        <div class="header">
+          <div class="headmain">
+            <div class="add">编辑/添加关卡</div>
+            <div class="img" style="cursor: pointer" @click="closeModal"></div>
+          </div>
+        </div>
+        <div class="main">
+          <div class="inma">
+            <div class="name">
+              <div class="d" style="margin-top: 2px; margin-right: 2px">
+                <img
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
+                />
+              </div>
+              <div class="fir">关卡名称：</div>
+              <div class="input">
+                <a-input
+                  style="width: 100%"
+                  v-model:value="value1"
+                  :maxlength="20"
+                  placeholder="请输入关卡名称"
+                />
+              </div>
+              <div class="co">{{ value1.length }}/20</div>
             </div>
-            <div class="imgfor">
-              <div class="forz">{{ styTitle }}</div>
-              <div class="fort">创建时间：{{ creTime }}</div>
+            <div class="name">
+              <div
+                class="d"
+                style="
+                  width: 10px;
+                  height: 10px;
+                  margin-top: 2px;
+                  margin-right: 2px;
+                "
+              ></div>
+              <div class="fir">关卡说明：</div>
+              <div class="input">
+                <a-textarea
+                  style="width: 100%"
+                  v-model:value="value2"
+                  :maxlength="100"
+                  placeholder="请输入关卡说明"
+                  :rows="5"
+                />
+              </div>
+              <div class="co1">{{ value2.length }}/100</div>
+            </div>
+            <div class="btn">
+              <button class="btn1" @click="closeModal">取消</button>
+              <button class="btn2" @click="editChapter">确定</button>
             </div>
           </div>
-          <div class="rightt">
-            <div class="select">
-              <span>学习模式：</span>
-              <div class="inputbox">
-                <input type="text" placeholder="按学习时间解锁" />
-                <div class="bottonbox"><div class="btnText">切换模式</div></div>
+        </div>
+      </a-modal>
+      <div class="right" :style="{ display: gqxy_hs ? 'block' : 'none' }">
+        <div class="addhead">
+          <div class="filt">
+            <div class="le">
+              <div class="leftimg">
+                <img class="img" :src="picUrl" />
+              </div>
+              <div class="imgfor">
+                <div class="forz">{{ styTitle }}</div>
+                <div class="fort">创建时间：{{ creTime }}</div>
               </div>
             </div>
-            <div class="line"></div>
-            <router-link to="/leveladd">
-              <div style="display: flex">
-                <img class="img2" src="../../assets/images/leveladd/back.png" />
-                <div class="return">返回</div>
+            <div class="rightt">
+              <div class="select">
+                <span>学习模式：</span>
+                <div class="inputbox">
+                  <input type="text" placeholder="按学习时间解锁" />
+                  <div class="bottonbox">
+                    <div class="btnText">切换模式</div>
+                  </div>
+                </div>
               </div>
-            </router-link>
+              <div class="line"></div>
+              <router-link to="/leveladd">
+                <div style="display: flex">
+                  <img
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
+                  />
+                  <div class="return">返回</div>
+                </div>
+              </router-link>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="mid">
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddOnline()">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zai.png" />
+        <div class="mid">
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddOnline()">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zai.png" />
+              </div>
+              <div class="text">在线</div>
             </div>
-            <div class="text">在线</div>
-          </div>
-          <!-- 添加在线侧弹窗 -->
-          <div>
-            <add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" v-model:edit="edit"
-              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
-              v-model:EditOnlineId="EditOnlineId" />
-          </div>
-          <!-- 添加在线侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/mian.png" />
+            <!-- 添加在线侧弹窗 -->
+            <div>
+              <add-online
+                v-model:addonlineVisible="addonlinevisible"
+                @changeData="updateTableData"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditOnlineId="EditOnlineId"
+              />
             </div>
-            <div class="text">面授</div>
+            <!-- 添加在线侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddCase()">
-            <div class="img">
-              <img src="../../assets/images/leveladd/an.png" />
+          <div class="item">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/mian.png" />
+              </div>
+              <div class="text">面授</div>
             </div>
-            <div class="text">案例</div>
+            <div class="lin"></div>
           </div>
-          <!-- 添加案例侧弹窗 -->
-          <div>
-              <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
-                v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
-                v-model:EditCaseId="EditCaseId" />
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddCase()">
+              <div class="img">
+                <img src="../../assets/images/leveladd/an.png" />
+              </div>
+              <div class="text">案例</div>
             </div>
             <!-- 添加案例侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddHomework">
-              <img src="../../assets/images/leveladd/zuo.png" />
-            </div>
-            <div class="text">作业</div>
-          </div>
-          <!-- 添加作业侧弹窗 -->
-          <div>
-            <add-homework
-              v-model:addhomeworkVisible="addhomeworkvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditWorkId="EditWorkId"
-              v-model:routerTaskId="routerTaskId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddTest">
-              <img src="../../assets/images/leveladd/kao.png" />
-            </div>
-            <div class="text">考试</div>
-          </div>
-          <!-- 添加考试侧弹窗 -->
-          <div>
-            <add-test
-              v-model:addtestVisible="addtestvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditTestId="EditTestId"
-              v-model:routerTaskId="routerTaskId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddLive">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zhi.png" />
-            </div>
-            <div class="text">直播</div>
-          </div>
-          <div>
-            <add-live
-              v-model:addliveVisible="addlivevisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:edit="edit"
-              v-model:EditLiveId="EditLiveId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddRef">
-            <div class="img">
-              <img src="../../assets/images/leveladd/wai.png" />
-            </div>
-            <div class="text">外链</div>
-          </div>
-          <div>
-            <add-ref
-              v-model:addrefVisible="addrefvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:edit="edit"
-              v-model:EditRefId="EditRefId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddDiscuss">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tao.png" />
-            </div>
-            <div class="text">讨论</div>
-          </div>
-          <div>
-            <add-discuss
-              v-model:adddiscussVisible="adddiscussvisible"
-              @changeData="updateTableData"
-              :isLevel="isLevel"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:EditDiscussId="EditDiscussId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddActive">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/huo.png" />
-            </div>
-            <div class="text">活动</div>
-          </div>
-          <div>
-            <add-active
-              v-model:addactiveVisible="addactivevisible"
-              :isLevel="isLevel"
-              v-model:edit="edit"
-              v-model:isactive="isactive"
-              @changeData="updateTableData"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:EditActiveId="EditActiveId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddEval">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/ce.png" />
-            </div>
-            <div class="text">测评</div>
-            <!-- 添加测评侧弹窗 -->
             <div>
-              <add-eval
-                v-model:addevalVisible="addevalvisible"
-                :isLevel="isLevel"
+              <add-case
+                v-model:addcaseVisible="addcasevisible"
                 @changeData="updateTableData"
-                v-model:isactive="isactive"
                 v-model:edit="edit"
-                v-model:routerId="routerId"
-                v-model:EditEvalId="EditEvalId"
-                v-model:routerTaskId="routerTaskId"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditCaseId="EditCaseId"
               />
             </div>
-            <!-- 添加测评侧弹窗 -->
+            <!-- 添加案例侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddInvist">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/diao.png" />
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddHomework">
+                <img src="../../assets/images/leveladd/zuo.png" />
+              </div>
+              <div class="text">作业</div>
             </div>
-            <div class="text">评估</div>
-            <!-- 添加评估侧弹窗 -->
+            <!-- 添加作业侧弹窗 -->
             <div>
-              <add-invist
-                v-model:addinvistVisible="addinvistvisible"
+              <add-homework
+                v-model:addhomeworkVisible="addhomeworkvisible"
                 :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
                 v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId"
-                v-model:EditInvistId="EditInvistId"
+                v-model:EditWorkId="EditWorkId"
                 v-model:routerTaskId="routerTaskId"
               />
             </div>
-            <!-- 添加评估侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddVote">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tou.png" />
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddTest">
+                <img src="../../assets/images/leveladd/kao.png" />
+              </div>
+              <div class="text">考试</div>
             </div>
-            <div class="text">投票</div>
-            <!-- 添加投票侧弹窗 -->
+            <!-- 添加考试侧弹窗 -->
             <div>
-              <add-vote
-                v-model:addvoteVisible="addvotevisible"
+              <add-test
+                v-model:addtestVisible="addtestvisible"
                 :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
                 v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId"
-                v-model:EditVoteId="EditVoteId"
+                v-model:EditTestId="EditTestId"
                 v-model:routerTaskId="routerTaskId"
               />
             </div>
-            <!-- 添加投票侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddVote">
-          <div class="itcon">
-            <div class="img">
-              <img
-                src="../../assets/images/leveladd/xiang.png"
-                @click="showDrawer"
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddLive">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zhi.png" />
+              </div>
+              <div class="text">直播</div>
+            </div>
+            <div>
+              <add-live
+                v-model:addliveVisible="addlivevisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:edit="edit"
+                v-model:EditLiveId="EditLiveId"
               />
             </div>
-            <div class="text">项目</div>
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddRef">
+              <div class="img">
+                <img src="../../assets/images/leveladd/wai.png" />
+              </div>
+              <div class="text">外链</div>
+            </div>
+            <div>
+              <add-ref
+                v-model:addrefVisible="addrefvisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:edit="edit"
+                v-model:EditRefId="EditRefId"
+              />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddDiscuss">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tao.png" />
+              </div>
+              <div class="text">讨论</div>
+            </div>
+            <div>
+              <add-discuss
+                v-model:adddiscussVisible="adddiscussvisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:isactive="isactive"
+                v-model:edit="edit"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:EditDiscussId="EditDiscussId"
+              />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddActive">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/huo.png" />
+              </div>
+              <div class="text">活动</div>
+            </div>
+            <div>
+              <add-active
+                v-model:addactiveVisible="addactivevisible"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:isactive="isactive"
+                @changeData="updateTableData"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:EditActiveId="EditActiveId"
+              />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddEval">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/ce.png" />
+              </div>
+              <div class="text">测评</div>
+              <!-- 添加测评侧弹窗 -->
+              <div>
+                <add-eval
+                  v-model:addevalVisible="addevalvisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:EditEvalId="EditEvalId"
+                  v-model:routerTaskId="routerTaskId"
+                />
+              </div>
+              <!-- 添加测评侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddInvist">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/diao.png" />
+              </div>
+              <div class="text">评估</div>
+              <!-- 添加评估侧弹窗 -->
+              <div>
+                <add-invist
+                  v-model:addinvistVisible="addinvistvisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditInvistId="EditInvistId"
+                  v-model:routerTaskId="routerTaskId"
+                />
+              </div>
+              <!-- 添加评估侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddVote">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tou.png" />
+              </div>
+              <div class="text">投票</div>
+              <!-- 添加投票侧弹窗 -->
+              <div>
+                <add-vote
+                  v-model:addvoteVisible="addvotevisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditVoteId="EditVoteId"
+                  v-model:routerTaskId="routerTaskId"
+                />
+              </div>
+              <!-- 添加投票侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddVote">
+            <div class="itcon">
+              <div class="img">
+                <img
+                  src="../../assets/images/leveladd/xiang.png"
+                  @click="showDrawer"
+                />
+              </div>
+              <div class="text">项目</div>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="boom">
-        <div class="boomcen">
-          <div class="title">
-            <div class="tit_left">
-              <span>任务列表</span>
-            </div>
-            <div class="tit_right">
-              <div class="btn btn1" @click="showChangeModal">
-                <div class="btnText">移动到任务阶段</div>
+        <div class="boom">
+          <div class="boomcen">
+            <div class="title">
+              <div class="tit_left">
+                <span>任务列表</span>
               </div>
-              <div class="btn btn2">
-                <div class="imgIcon"></div>
-                <div class="btnText" @click="showDeleteALLModal">批量删除</div>
+              <div class="tit_right">
+                <div class="btn btn1" @click="showChangeModal">
+                  <div class="btnText">移动到任务阶段</div>
+                </div>
+                <div class="btn btn2">
+                  <div class="imgIcon"></div>
+                  <div class="btnText" @click="showDeleteALLModal">
+                    批量删除
+                  </div>
+                </div>
               </div>
             </div>
-          </div>
-          <div class="tableBox">
-            <div
-              style="
-                height: 50px;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                background-color: #eff4fc;
-                font-size: 14px;
-                font-weight: 400;
-                color: #999ba3;
-                line-height: 36px;
-                border-bottom: 1px solid #f2f6fc;
-              "
-            >
+            <div class="tableBox">
               <div
                 style="
-                  width: 87px;
-                  text-align: center;
+                  height: 50px;
                   display: flex;
-                  margin-left: 46px;
+                  justify-content: space-between;
+                  align-items: center;
+                  background-color: #eff4fc;
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #999ba3;
+                  line-height: 36px;
+                  border-bottom: 1px solid #f2f6fc;
                 "
               >
-                <img
+                <div
                   style="
-                    width: 16px;
-                    height: 16px;
-                    cursor: pointer;
-                    margin-top: 12px;
+                    width: 87px;
+                    text-align: center;
+                    display: flex;
+                    margin-left: 46px;
                   "
-                  :src="
-                    selectAll === 0
-                      ? require('../../assets/images/notSelect.png')
-                      : selectAll === 1
-                      ? require('../../assets/images/selectAll.png')
-                      : require('../../assets/images/select.png')
-                  "
-                  @click="selectRowAll"
-                />
-                <!-- <a-checkbox
+                >
+                  <img
+                    style="
+                      width: 16px;
+                      height: 16px;
+                      cursor: pointer;
+                      margin-top: 12px;
+                    "
+                    :src="
+                      selectAll === 0
+                        ? require('../../assets/images/notSelect.png')
+                        : selectAll === 1
+                        ? require('../../assets/images/selectAll.png')
+                        : require('../../assets/images/select.png')
+                    "
+                    @click="selectRowAll"
+                  />
+                  <!-- <a-checkbox
                     v-model:checked="selectAll"
                     @change="selectRowAll"
                   >
                   </a-checkbox> -->
-                <div style="margin-top: 2px; margin-left: 8px">类型</div>
-              </div>
-              <div style="width: 120px; text-align: center">任务名称</div>
-              <div style="width: 120px; text-align: center">必修/选修</div>
-              <div style="width: 87px; text-align: center">时长</div>
-              <div style="width: 120px; text-align: center; margin-right: 20px">
-                操作
-              </div>
-            </div>
-            <draggable
-              v-model="tableData"
-              chosenClass="chosen"
-              ghostClass="ghost"
-              forceFallback="true"
-              group="task"
-              animation="500"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <template #item="{ element }">
+                  <div style="margin-top: 2px; margin-left: 8px">类型</div>
+                </div>
+                <div style="width: 120px; text-align: center">任务名称</div>
+                <div style="width: 120px; text-align: center">必修/选修</div>
+                <div style="width: 87px; text-align: center">时长</div>
                 <div
-                  style="
-                    height: 50px;
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    border-bottom: 1px solid #f2f6fc;
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #4f5156;
-                    line-height: 36px;
-                  "
-                  class="tableRow"
+                  style="width: 120px; text-align: center; margin-right: 20px"
                 >
+                  操作
+                </div>
+              </div>
+              <draggable
+                v-model="tableData"
+                chosenClass="chosen"
+                ghostClass="ghost"
+                forceFallback="true"
+                group="task"
+                animation="500"
+                @start="onStart"
+                @end="onEnd"
+              >
+                <template #item="{ element }">
                   <div
                     style="
-                      width: 87px;
-                      text-align: center;
-                      margin-left: 46px;
-                      position: relative;
+                      height: 50px;
+                      display: flex;
+                      justify-content: space-between;
+                      align-items: center;
+                      border-bottom: 1px solid #f2f6fc;
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4f5156;
+                      line-height: 36px;
                     "
+                    class="tableRow"
                   >
-                    <div class="racona">
-                      <div
-                        class="img"
-                        style="
-                          cursor: pointer;
-                          margin-top: 2px;
-                          margin-right: 9px;
-                          position: absolute;
-                          left: -25px;
-                        "
-                      ></div>
-                      <a-checkbox
-                        :id="element.id"
-                        v-model:checked="element.checked"
-                        @change="changeRow"
-                      >
-                      </a-checkbox>
-                      <div style="margin-top: 2px; margin-left: 8px">
-                        {{ element.lei }}
+                    <div
+                      style="
+                        width: 87px;
+                        text-align: center;
+                        margin-left: 46px;
+                        position: relative;
+                      "
+                    >
+                      <div class="racona">
+                        <div
+                          class="img"
+                          style="
+                            cursor: pointer;
+                            margin-top: 2px;
+                            margin-right: 9px;
+                            position: absolute;
+                            left: -25px;
+                          "
+                        ></div>
+                        <a-checkbox
+                          :id="element.id"
+                          v-model:checked="element.checked"
+                          @change="changeRow"
+                        >
+                        </a-checkbox>
+                        <div style="margin-top: 2px; margin-left: 8px">
+                          {{ element.lei }}
+                        </div>
                       </div>
                     </div>
-                  </div>
-                  <div style="width: 120px; text-align: center">
-                    {{ element.creater }}
-                  </div>
-                  <div style="width: 120px; text-align: center">
-                    <div class="opat">
-                      <div class="opacationt clearfix">
-                        <a-switch
-                          style="margin-left: -50px; margin-top: 3px"
-                          v-model:checked="element.checked1"
-                          size="small"
-                          active-color="red"
-                          @click="changeCourseType(element)"
-                        />
-                        <div class="showt clearfix">
-                          <div
-                            class="bi"
-                            :style="{
-                              'z-index': element.checked1 ? 999 : 998,
-                            }"
-                          >
-                            必修
+                    <div style="width: 120px; text-align: center">
+                      {{ element.creater }}
+                    </div>
+                    <div style="width: 120px; text-align: center">
+                      <div class="opat">
+                        <div class="opacationt clearfix">
+                          <a-switch
+                            style="margin-left: -50px; margin-top: 3px"
+                            v-model:checked="element.checked1"
+                            size="small"
+                            active-color="red"
+                            @click="changeCourseType(element)"
+                          />
+                          <div class="showt clearfix">
+                            <div
+                              class="bi"
+                              :style="{
+                                'z-index': element.checked1 ? 999 : 998,
+                              }"
+                            >
+                              必修
+                            </div>
+                            <div class="xuan">选修</div>
                           </div>
-                          <div class="xuan">选修</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="width: 87px; text-align: center">
+                      {{ element.cretime }}分钟
+                    </div>
+                    <div
+                      style="
+                        width: 120px;
+                        text-align: center;
+                        margin-right: 20px;
+                      "
+                    >
+                      <div class="opa">
+                        <div class="opacation">
+                          <span
+                            style="
+                              color: #4ea6ff;
+                              margin-right: 25px;
+                              cursor: pointer;
+                            "
+                            @click="
+                              decideType(
+                                element.lei,
+                                element.courseId,
+                                element.id
+                              )
+                            "
+                          >
+                            编辑
+                          </span>
+                          <span
+                            style="color: #4ea6ff; cursor: pointer"
+                            @click="showDeleteModal(element.id)"
+                          >
+                            删除
+                          </span>
                         </div>
                       </div>
                     </div>
                   </div>
-                  <div style="width: 87px; text-align: center">
-                    {{ element.cretime }}分钟
+                </template>
+              </draggable>
+            </div>
+            <!-- 无数据样式 -->
+            <div
+              class="notable"
+              :style="{ display: stm_hs ? 'block' : 'none' }"
+            >
+              <div class="notablebox">
+                <div class="boxbody">
+                  <div class="boximg"></div>
+                  <div class="boxtitle">
+                    <span style="color: #ffb64e; font-size: 20px">无任务</span>
                   </div>
-                  <div
-                    style="width: 120px; text-align: center; margin-right: 20px"
-                  >
-                    <div class="opa">
-                      <div class="opacation">
-                        <span
-                          style="
-                            color: #4ea6ff;
-                            margin-right: 25px;
-                            cursor: pointer;
-                          "
-                          @click="
-                            decideType(
-                              element.lei,
-                              element.courseId,
-                              element.id
-                            )
-                          "
-                        >
-                          编辑
-                        </span>
-                        <span
-                          style="color: #4ea6ff; cursor: pointer"
-                          @click="showDeleteModal(element.id)"
-                        >
-                          删除
-                        </span>
-                      </div>
-                    </div>
+                  <div class="boxtitle2">
+                    <span style="color: #878b92">请点击上方，创建任务</span>
                   </div>
                 </div>
-              </template>
-            </draggable>
-          </div>
-          <!-- 无数据样式 -->
-          <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
-            <div class="notablebox">
-              <div class="boxbody">
-                <div class="boximg"></div>
-                <div class="boxtitle">
-                  <span style="color: #ffb64e; font-size: 20px">无任务</span>
-                </div>
-                <div class="boxtitle2">
-                  <span style="color: #878b92">请点击上方，创建任务</span>
-                </div>
+                <div class="smallleft"></div>
+                <div class="smallright"></div>
               </div>
-              <div class="smallleft"></div>
-              <div class="smallright"></div>
             </div>
-          </div>
-          <!-- 无数据样式 -->
-        </div>
-      </div>
-      <div class="footbtn">
-        <div class="btnbox">
-          <div class="btn btn2">
-            <div class="btnText">暂存</div>
-          </div>
-          <div class="btn btn2">
-            <div class="btnText">确定</div>
-          </div>
-          <div class="btn btn1" @click="gqxy_hShow">
-            <div class="btnText">下一步</div>
+            <!-- 无数据样式 -->
           </div>
         </div>
-      </div>
-      <div class="draw" style="position: relative">
-        <a-drawer
-          v-model:visible="visible"
-          class="drawerStyle ProjectDrawer"
-          title="关联项目"
-          placement="right"
-          width="80%"
-          @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 class="draw" style="position: relative">
+          <a-drawer
+            v-model:visible="visible"
+            class="drawerStyle ProjectDrawer"
+            title="关联项目"
+            placement="right"
+            width="80%"
+            @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="drawerbox">
+                <a-table
+                  :columns="drawertableColumns()"
+                  :data-source="drawertableData"
+                  :loading="tableDataTotal === -1 ? true : false"
+                  :scroll="{ x: 700 }"
+                  @expand="expandTable"
+                  :pagination="false"
+                >
+                </a-table>
+              </div>
+              <div class="btnn">
+                <button @click="showDrawer" class="btn1">取消</button>
+                <button @click="showDrawer" class="btn2">确定</button>
+              </div>
             </div>
-            <div class="drawerbox">
-              <a-table
-                :columns="drawertableColumns()"
-                :data-source="drawertableData"
-                :loading="tableDataTotal === -1 ? true : false"
-                :scroll="{ x: 700 }"
-                @expand="expandTable"
-                :pagination="false"
-              >
-              </a-table>
-            </div>
-            <div class="btnn">
-              <button @click="showDrawer" class="btn1">取消</button>
-              <button @click="showDrawer" class="btn2">确定</button>
-            </div>
-          </div>
-        </a-drawer>
+          </a-drawer>
+        </div>
       </div>
     </div>
+
+    <div class="footbtn">
+      <div class="btnbox">
+        <div class="btn btn2">
+          <div class="btnText">暂存</div>
+        </div>
+        <div class="btn btn2">
+          <div class="btnText">确定</div>
+        </div>
+        <div class="btn btn1">
+          <div class="btnText">取消</div>
+        </div>
+      </div>
+    </div>
+
     <div class="right" :style="{ display: gqxy_hs ? 'none' : 'block' }">
       <div class="addhead">
         <div class="filt">
@@ -959,6 +993,39 @@
         </div>
       </div></a-modal
     >
+
+
+
+    <!-- 是否删除关卡弹窗 -->
+        <a-modal
+      v-model:visible="deleteChapterModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      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="closeDeleteChapter"></div>
+          </div>
+          <div class="body">
+            <span>您确定要删除此关卡</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeDeleteChapter">
+              <div class="btnText" >取消</div>
+            </div>
+            <div class="del_btn btn2" @click="deleteChapter">
+              <div class="btnText" >确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -966,8 +1033,8 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
-import AddOnline from "../../components/drawers/AddOnline.vue"
-import AddCase from "../../components/drawers/AddCase.vue"
+import AddOnline from "../../components/drawers/AddOnline.vue";
+import AddCase from "../../components/drawers/AddCase.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
@@ -1221,8 +1288,8 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
-      EditOnlineId:"", // 要编辑的 workid
-      EditCaseId:"",
+      EditOnlineId: "", // 要编辑的 workid
+      EditCaseId: "",
       EditWorkId: "",
       EditTestId: "",
       EditRefId: "",
@@ -1249,8 +1316,8 @@ export default {
       adddiscussvisible: false, //讨论抽屉
       isStudiscuss: false,
       addactivevisible: false, //活动抽屉
-      addonlinevisible:false,
-      addcasevisible:false,
+      addonlinevisible: false,
+      addcasevisible: false,
       addhomeworkvisible: false,
       addtestvisible: false,
       addevalvisible: false,
@@ -1272,21 +1339,63 @@ export default {
       projectId: null,
       projectTaskId: null,
       chooseStageId: null,
+
+      updateChapterID: null, //编辑关卡id
+      deleteChapterModal:false,//删除关卡弹窗
+      deleteChapterId:null,//删除关卡id
     });
 
+    const showModal = (element) => {
+      state.modal = true;
+      console.log("element", element);
+      if (element) {
+        console.log("element", element);
+        state.value1 = element.name;
+        state.value2 = element.remark;
+        state.updateChapterID = element.chapterId;
+      }
+    };
+    const closeModal = () => {
+      state.modal = false;
+      state.value1 = "";
+      state.value2 = "";
+      state.updateChapterID = null;
+    };
     //新建关卡
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
-      let obj = {
+      if (state.updateChapterID) {
+         let obj = {
+        name: state.value1,
+        remark: state.value2,
+        routerId: state.routerId,
+        chapterId:state.updateChapterID
+      };
+        api
+          .updateChapter(obj)
+          .then((res) => {
+            console.log("修改成功", res);
+            message.success("修改成功");
+            getDetail();
+            closeModal();
+          })
+          .catch((err) => {
+            console.log("修改失败", err);
+          });
+      } else {
+         let obj = {
         name: state.value1,
         remark: state.value2,
         routerId: state.routerId,
       };
-      api
-        .editChapter(obj)
-        .then((res) => {
-          setTimeout(() => {
+        api
+          .editChapter(obj)
+          .then((res) => {
             console.log("创建成功", res);
+            // setTimeout(() => {
+            //   console.log("创建成功", res);
+
+            // }, 1000);
             message.success("创建成功");
             state.value1 = "";
             state.value2 = "";
@@ -1294,51 +1403,65 @@ export default {
             // state.createLoading = false;
             //state.currentPage = 1;
             // getLearnPath();
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("创建失败", err);
-        });
+            getDetail();
+            closeModal();
+          })
+          .catch((err) => {
+            console.log("创建失败", err);
+          });
+      }
     };
 
-    //编辑关卡
-    // const updateChapter = () => {
-    //   let obj = {
-    //     chapterId: state.updateChapterID,
-    //     name: "",
-    //     remark:"",
-    //     routerId: 0,
-    //   };
-    //   api
-    //     .updateChapter(obj)
-    //     .then((res) => {
-    //       console.log("修改成功",res);
-    //       message.success("修改成功");
-    //     })
-    //     .catch((err) => {
-    //       console.log("修改失败",err);
-    //     })
-    // };
     const showDrawer = () => {
       state.visible = true;
     };
+
+//打开删除关卡弹窗
+const showDeleteChapter=(id)=>{
+state.deleteChapterId=id
+ state.deleteChapterModal=true
+}
+//关闭删除关卡弹窗
+const closeDeleteChapter=()=>{
+  state.deleteChapterId=null
+  state.deleteChapterModal=false
+}
+ //删除关卡
+    const deleteChapter = () => {
+      console.log("chapterId", state.deleteChapterId);
+      let obj = {
+        chapterId: state.deleteChapterId,
+      };
+      api
+        .deleteChapter(obj)
+        .then((res) => {
+          console.log("删除关卡成功", res);
+          message.success('删除关卡成功')
+          closeDeleteChapter()
+          getDetail();
+        })
+        .catch((err) => {
+          console.log("删除关卡失败", err);
+        });
+    };
+
     //关闭项目抽屉
     const leaveProjDrawer = () => {
       state.addprojvisible = false;
       state.isLevel = false;
     };
     //在线抽屉
-    const showDrawerAddOnline = (id,eleId)=>{
+    const showDrawerAddOnline = (id, eleId) => {
       state.addonlinevisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
-    }
+    };
     //案例抽屉
-    const showDrawerAddCase = (id,eleId)=>{
+    const showDrawerAddCase = (id, eleId) => {
       state.addcasevisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
-    }
+    };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
       console.log("homework==============", id, state.isactive);
@@ -1460,14 +1583,7 @@ export default {
     const closeDrawer = () => {
       state.visible = false;
     };
-    const showModal = () => {
-      state.modal = true;
-    };
-    const closeModal = () => {
-      state.modal = false;
-      state.value1 = "";
-      state.value2 = "";
-    };
+
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
@@ -1849,22 +1965,7 @@ export default {
         showDrawerAddCase(id, eleId);
       }
     };
-    //删除关卡
-    const deleteChapter = (chapterId) => {
-      console.log("chapterId", chapterId);
-      let obj = {
-        chapterId: chapterId,
-      };
-      api
-        .deleteChapter(obj)
-        .then((res) => {
-          console.log("删除关卡成功", res);
-        })
-        .catch((err) => {
-          console.log("删除关卡失败", err);
-        });
-    };
-
+   
     const changeCourseType = (ele) => {
       console.log("任务id", ele.id);
       console.log("flag", ele.checked1);
@@ -1910,7 +2011,13 @@ export default {
     const rowSelection = {
       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;
@@ -1944,35 +2051,35 @@ export default {
           let arr = res.data.data.rows;
           if (res.status === 200) {
             getTableDate(arr);
-            console.log('---------------项目信息---------------------------');
+            console.log("---------------项目信息---------------------------");
           }
         })
         .catch((err) => {
           console.log("获取全部项目信息接口失败", err);
-          console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
+          console.log("+++++++++++++++++++++++++++++++++++++++++++++++");
           // state.createLoading = false;
         });
     };
     const updateTask = () => {
-        RouterEditTask({
-          chapterId: state.isactive,
-          courseId: state.assessmentId,
-          name: state.assessmentName,
-          routerId: state.routerId,
-          routerTaskId: state.routerTaskId || 0,
-          type: 13,
+      RouterEditTask({
+        chapterId: state.isactive,
+        courseId: state.assessmentId,
+        name: state.assessmentName,
+        routerId: state.routerId,
+        routerTaskId: state.routerTaskId || 0,
+        type: 13,
+      })
+        .then((res) => {
+          console.log(res, 11111);
+          message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
+          // ctx.emit("changeData", false);
+          closeDrawer();
+          state.addLoading = false;
         })
-          .then((res) => {
-            console.log(res, 11111);
-            message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`)
-            // ctx.emit("changeData", false);
-            closeDrawer();
-            state.addLoading = false;
-          })
-          .catch((err) => {
-            console.log(err, 1111);
-          });
-    }
+        .catch((err) => {
+          console.log(err, 1111);
+        });
+    };
     onMounted(() => {
       // createCase();
       getAllProjText();
@@ -2021,7 +2128,6 @@ export default {
       showDeleteModal,
       decideType,
       updateTableData,
-      deleteChapter,
       changeCourseType,
       showChangeModal,
       closeChangeModal,
@@ -2030,6 +2136,10 @@ export default {
       getTableDate,
       getAllProjText,
       updateTask,
+
+      showDeleteChapter,
+      closeDeleteChapter,
+      deleteChapter,
     };
   },
 };
@@ -2472,6 +2582,7 @@ export default {
 .leveladddetail {
   width: 100%;
   display: flex;
+  flex-direction: column;
   min-width: 933px;
   background-color: rgba(245, 247, 250, 1);
   .left {
@@ -2565,7 +2676,7 @@ export default {
               .imgIcon {
                 width: 16px;
                 height: 16px;
-                background-image: url(@/assets/images/leveladd/edit.png);
+                background-image: url(@/assets/images/leveladd/edit1.png);
                 background-size: 100% 100%;
               }
             }
@@ -3184,49 +3295,6 @@ export default {
         }
       }
     }
-    .footbtn {
-      width: 100%;
-      flex: 1;
-      background-color: #fff;
-      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
-      display: flex;
-      justify-content: end;
-      .btnbox {
-        display: flex;
-        margin-right: 36px;
-        .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;
-          flex-shrink: 0;
-          margin: 21px 0px 19px 14px;
-          cursor: pointer;
-          white-space: nowrap;
-          .btnText {
-            font-size: 14px;
-            font-weight: 400;
-            line-height: 36px;
-            margin-left: 5px;
-          }
-        }
-        .btn1 {
-          background-color: #409eff;
-          .btnText {
-            color: #ffffff;
-          }
-        }
-        .btn2 {
-          background-color: #ffffff;
-          .btnText {
-            color: #409eff;
-          }
-        }
-      }
-    }
   }
 
   .opat {
@@ -3287,6 +3355,52 @@ export default {
       margin-left: 10px;
     }
   }
+  .footbtn {
+    width: 100%;
+    height: 80px;
+    margin-top: 16px;
+    // flex: 1;
+    background-color: #fff;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+    display: flex;
+    justify-content: end;
+    .btnbox {
+      display: flex;
+      margin-right: 36px;
+      height: 80px;
+      .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;
+        flex-shrink: 0;
+        margin: 21px 0px 19px 14px;
+        cursor: pointer;
+        white-space: nowrap;
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btn1 {
+        background-color: #409eff;
+        .btnText {
+          color: #ffffff;
+        }
+      }
+      .btn2 {
+        background-color: #ffffff;
+        .btnText {
+          color: #409eff;
+        }
+      }
+    }
+  }
 }
 .CopyModal {
   .ant-modal {
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 1dd9ddc0..57526254 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -261,7 +261,7 @@
               class="nameimg"
               src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">培训体系</div>
+            <div class="inname">培训分类</div>
           </div>
           <div class="in select">
             <a-select
@@ -675,7 +675,7 @@ export default {
       levels = key;
     };
 
-    // 培训体系
+    // 培训分类
     const classifyList4 = ref([
       { value: 1, label: "集团级" },
       { value: 2, label: "组织级" },
@@ -748,7 +748,7 @@ export default {
       managerId: "请选择项目经理",
       sourceBelongId: "请选择资源归属",
       level: "请填写项目级别",
-      systemId: "请填写项目培训体系",
+      systemId: "请填写项目培训分类",
       boeFlag: "请选择是否BOE实施",
     };
 
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 87f27829..7b3536d8 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -478,11 +478,11 @@
                 </div>
               </div>
               <div class="set_content">
-                <div class="setc_name"><span>培训体系：</span></div>
+                <div class="setc_name"><span>培训分类：</span></div>
                 <div class="setc_main">
                   <a-select
                     v-model:value="formData.systemId"
-                    placeholder="请选择培训体系"
+                    placeholder="请选择培训分类"
                     :size="large" :bordered="isEdit" :disabled="!isEdit"
                     style="width: 200px;color: #999999;" :options="systemOptions"
                   ></a-select>
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index deb832c8..a3d759ad 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -247,7 +247,7 @@
               class="nameimg"
               src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">培训体系</div>
+            <div class="inname">培训分类</div>
           </div>
           <div class="in select">
             <a-select
@@ -359,7 +359,7 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
@@ -716,7 +716,7 @@ export default {
       levels = key;
     };
 
-    // 培训体系
+    // 培训分类
     const classifyList4 = ref([
       { value: 1, label: "集团级" },
       { value: 2, label: "组织级" },
@@ -1021,6 +1021,9 @@ export default {
       }
     };
 
+    onUnmounted(() => {
+      storage.remove("projectAddId");
+    });
     return {
       ...toRefs(state),
       projectName,
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 51607e06..69386b2f 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1024,6 +1024,35 @@
         </div>
       </div>
     </a-modal>
+<!-- 创建项目提示框 -->
+ <a-modal
+      v-model:visible="reminderModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      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="closeReminderModal"></div>
+          </div>
+          <div class="body">
+            <div style="margin-left:60px;margin-right:60px">请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同</div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn2" @click="okReminderModal">
+              <div class="btnText">好的</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+
+
     <!-- 归属权抽屉 -->
     <proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
     <!-- 授权名单抽屉 -->
@@ -1032,6 +1061,9 @@
     <proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
     <!-- 管理权抽屉 -->
     <proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
+
+
+
   </div>
 </template>
 <script>
@@ -1069,6 +1101,7 @@ export default {
       projectPub: false, //发布弹窗
       backModal: false, //撤回弹窗
       closeBack: false, //撤回弹窗关闭图标
+      reminderModal:false,//温馨提示弹窗
       ProjOwnervisible: false,
       ProjPvisible: false,
       ProjCheckvisible: false,
@@ -3038,7 +3071,8 @@ export default {
     };
 
     const showModal1 = () => {
-      state.estabish = true;
+     
+     state.reminderModal=true
     };
     const closeModal1 = () => {
       state.estabish = false;
@@ -3067,6 +3101,14 @@ export default {
       state.ProjManagevisible = true;
     };
 
+const closeReminderModal=()=>{
+  state.reminderModal=false
+   
+}
+const okReminderModal=()=>{
+  state.reminderModal=false
+  state.estabish = true;
+}
     return {
       ...toRefs(state),
       selectProjectName,
@@ -3168,6 +3210,8 @@ export default {
       deleteProject,
       templateProject,
       copyProject,
+      closeReminderModal,
+      okReminderModal,
     };
   },
 };
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index be713def..c23768b2 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -154,7 +154,7 @@
 				<div class="name">
 					<div class="namebox">
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">培训体系</div>
+						<div class="inname">培训分类</div>
 					</div>
 					<div class="in select">
 						<a-select :getPopupContainer="
@@ -529,7 +529,7 @@ export default {
 			levels = key;
 		};
 
-		// 培训体系
+		// 培训分类
 		const classifyList4 = ref([
 			{ value: 1, label: "集团级" },
 			{ value: 2, label: "组织级" },
@@ -602,7 +602,7 @@ export default {
 			managerId: "请选择项目经理",
 			sourceBelongId: "请选择资源归属",
 			level: "请填写项目级别",
-			systemId: "请填写项目培训体系",
+			systemId: "请填写项目培训分类",
 			boeFlag: "请选择是否BOE实施"
 		};
 
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 8a83b195..ab10d80e 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1,396 +1,470 @@
 <template>
   <div class="taskadd">
-    <div class="left clearfix">
-      <div class="leftmain">
-        <div class="tit">
-          阶段<img
-            src="../../assets/images/projectadd/right.png"
-            style="margin-left: 10px; cursor: pointer"
-            @click="showCancel"
-          />
-        </div>
-        <!-- @click="showModal" -->
-        <div class="btn btn3" @click="showConfirm" style="margin-left: 19px">
-          <div class="search"></div>
-          <div class="btnText">添加阶段</div>
-        </div>
-        <div class="maincon" style="background-color: #fff">
-          <draggable
-            v-model="level"
-            chosenClass="chosen"
-            ghostClass="ghost"
-            forceFallback="true"
-            group="stage"
-            animation="500"
-            @start="onStart"
-            @end="onEnd"
+    <div style="display: flex">
+      <div class="left clearfix">
+        <div class="leftmain">
+          <div class="tit">
+            阶段<img
+              src="../../assets/images/projectadd/right.png"
+              style="margin-left: 10px; cursor: pointer"
+              @click="showCancel"
+            />
+          </div>
+          <!-- @click="showModal" -->
+          <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
+            <div class="search"></div>
+            <div class="btnText">添加阶段</div>
+          </div>
+          <div class="maincon" style="background-color: #fff">
+            <!-- <div
+            class="items"
+            :class="{ active: isActive == true }"
+            @click="changebgc"
+            v-for="item in level"
+            :key="item.id"
+          > -->
+
+            <draggable
+              v-model="level"
+              chosenClass="chosen"
+              ghostClass="ghost"
+              forceFallback="true"
+              group="stage"
+              animation="500"
+            >
+              <template #item="{ element }">
+                <div
+                  class="items"
+                  :class="chooseStageId == element.id ? 'active' : ''"
+                  @click="changebgc(element.id)"
+                >
+                  <div class="items1">
+                    <div class="boxs_left">
+                      <a-popover placement="topLeft" trigger="click">
+                        <template #content>
+                          <div style="width: 130px">
+                            {{ element.name ? element.name : "暂无说明" }}
+                          </div>
+                        </template>
+                        <template #title>
+                          <span>阶段说明</span>
+                        </template>
+                        <div class="script">
+                          <span style="font-size: 12px; color: #ffffff"
+                            >说明</span
+                          >
+                        </div>
+                      </a-popover>
+
+                      <div class="imgIcon" @click="showModal(element)"></div>
+                    </div>
+                    <div class="boxs_right">
+                      <div
+                        class="imgIcon"
+                        @click="showDeleteStage(element.id)"
+                      ></div>
+                    </div>
+                  </div>
+                  <div class="items2">
+                    <a-popover
+                      placement="topLeft"
+                      v-if="element.tit.length > 10"
+                    >
+                      <template #content>
+                        <div style="width: 130px">
+                          {{ element.tit }}
+                        </div>
+                      </template>
+                      <!-- <template #title>
+                        <span>关卡说明</span>
+                      </template> -->
+                      <div class="nname">
+                        {{ element.tit }}
+                      </div>
+                    </a-popover>
+                    <div class="nname" v-if="element.tit.length <= 10">
+                      {{ element.tit }}
+                    </div>
+                  </div>
+                  <!-- <div class="itemle">
+              <div class="tit">{{ item.remark }}</div>
+              <div class="name">{{ item.name }}</div>
+            </div> -->
+                </div>
+              </template>
+            </draggable>
+
+            <!-- <div
+            class="items"
+            :class="isactive == index ? 'active' : ''"
+            @click="changebgc(index)"
+            v-for="(item, index) in level"
+            :key="item.chapterId"
           >
-            <template #item="{ element }">
-              <div
-                class="item"
-                :class="chooseStageId == element.id ? 'bgcactive' : ''"
-                @click="changebgc(element.id)"
-              >
-                <div class="itemle">
-                  <div class="tit">{{ element.tit }}</div>
-                  <div class="name">{{ element.name }}</div>
-                </div>
-                <div class="itemri">
-                  <img src="../../assets/images/leveladd/z1.png" />
-                  <img
-                    style="margin-top: 40px"
-                    src="../../assets/images/leveladd/z2.png"
-                  />
+            <div class="items1">
+              <div class="boxs_left">
+                <div class="script">
+                  <span style="font-size: 12px; color: #ffffff">说明</span>
                 </div>
+                <div class="imgIcon"></div>
               </div>
-            </template>
-          </draggable>
+              <div class="boxs_right">
+                <div class="imgIcon"></div>
+              </div>
+            </div>
+            <div class="items2">
+              <div class="nname">{{ item.name }}</div>
+            </div>
+          </div> -->
+          </div>
         </div>
       </div>
-    </div>
-    <div class="right">
-      <div class="addhead">
-        <div class="filt">
-          <div class="le">
-            <div class="leftimg">
-              <img class="img" :src="picUrl" />
-            </div>
-            <div class="imgfor">
-              <div class="forz" style="font-weight: 700">
-                {{ projectTitle }}
+      <div class="right">
+        <div class="addhead">
+          <div class="filt">
+            <div class="le">
+              <div class="leftimg">
+                <img class="img" :src="picUrl" />
+              </div>
+              <div class="imgfor">
+                <div class="forz" style="font-weight: 700">
+                  {{ projectTitle }}
+                </div>
               </div>
             </div>
-          </div>
-          <div class="rightt">
-            <div class="select">
-              <a-select
-                v-model:value="projectName"
-                style="width: 200px"
-                placeholder="自由学习模式"
-                :options="projectNameList"
-                @change="selectProjectName"
-                allowClear
-                showSearch
-              ></a-select>
-            </div>
-            <div class="line"></div>
-            <img class="img2" src="../../assets/images/projectadd/keep.png" />
+            <div class="rightt">
+              <div class="select">
+                <span>学习模式：</span>
+                <div class="inputbox">
+                  <input type="text" placeholder="按学习时间解锁" />
+                  <div class="bottonbox">
+                    <div class="btnText">切换模式</div>
+                  </div>
+                </div>
+              </div>
+              <div class="line"></div>
+              <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
             <div class="pub">保存</div>
-            <div class="line"></div>
-            <router-link to="/taskpage">
-              <div style="display: flex">
-                <img class="img2" src="../../assets/images/leveladd/back.png" />
-                <div class="return">返回</div>
+            <div class="line"></div> -->
+              <router-link to="/taskpage">
+                <div style="display: flex">
+                  <img
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
+                  />
+                  <div class="return">返回</div>
+                </div>
+              </router-link>
+            </div>
+          </div>
+        </div>
+        <div class="mid">
+          <div class="item" @click="showDrawerOnline">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zai.png" />
               </div>
-            </router-link>
-          </div>
-        </div>
-      </div>
-      <div class="mid">
-        <div class="item" @click="showDrawerOnline">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zai.png" />
+              <div class="text">在线</div>
             </div>
-            <div class="text">在线</div>
-          </div>
-          <!-- 添加在线侧弹窗 -->
-          <div>
-            <add-online
-              v-model:addonlineVisible="addonlinevisible"
-              @changeData="updateTableData"
-              :isLevel="isLevel"
-              v-model:edit="edit"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:EditOnlineId="EditOnlineId"
-            />
-          </div>
-          <!-- 添加在线侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerFaceteach">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/mian.png" />
-            </div>
-            <div class="text">面授</div>
-          </div>
-          <!-- 添加面授侧弹窗 -->
-          <div>
-            <add-faceteach
-              v-model:addfaceteachVisible="addfaceteachvisible"
-              v-model:EditEvalId="EditEvalId"
-            />
-          </div>
-          <!-- 添加面授侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddCase">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/an.png" />
-            </div>
-            <div class="text">案例</div>
-          </div>
-          <!-- 添加案例侧弹窗 -->
-          <div>
-            <add-case
-              v-model:addcaseVisible="addcasevisible"
-              @changeData="updateTableData"
-              :isLevel="isLevel"
-              v-model:edit="edit"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:EditCaseId="EditCaseId"
-            />
-          </div>
-          <!-- 添加案例侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddHomework">
-              <img src="../../assets/images/leveladd/zuo.png" />
-            </div>
-            <div class="text">作业</div>
-          </div>
-          <!-- 添加作业侧弹窗 -->
-          <div>
-            <add-homework
-              v-model:addhomeworkVisible="addhomeworkvisible"
-              @changeData="updateTableData"
-              v-model:isLevel="isLevel"
-              v-model:edit="edit"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditWorkId="EditWorkId"
-              v-model:projectTaskId="projectTaskId"
-            />
-          </div>
-          <!-- 添加作业侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddTest">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/kao.png" />
-            </div>
-            <div class="text">考试</div>
-          </div>
-          <!-- 添加考试侧弹窗 -->
-          <div>
-            <add-test
-              v-model:addtestVisible="addtestvisible"
-              @changeData="updateTableData"
-              :isLevel="isLevel"
-              v-model:edit="edit"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditTestId="EditTestId"
-              v-model:projectTaskId="projectTaskId"
-            />
-          </div>
-          <!-- 添加考试侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddLive">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zhi.png" />
-            </div>
-            <div class="text">直播</div>
-          </div>
-          <!-- 添加直播侧弹窗 -->
-          <div>
-            <add-live
-              v-model:addliveVisible="addlivevisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:edit="edit"
-              v-model:EditLiveId="EditLiveId"
-              v-model:projectTaskId="projectTaskId"
-            />
-          </div>
-          <!-- 添加直播侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddRef">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/wai.png" />
-            </div>
-            <div class="text">外链</div>
-          </div>
-          <!-- 添加外链侧弹窗 -->
-          <div>
-            <add-ref
-              v-model:addrefVisible="addrefvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:edit="edit"
-              v-model:EditRefId="EditRefId"
-              v-model:projectTaskId="projectTaskId"
-            />
-          </div>
-          <!-- 添加外链侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddDiscuss">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tao.png" />
-            </div>
-            <div class="text">讨论</div>
-          </div>
-          <!-- 添加讨论侧弹窗 -->
-          <div>
-            <add-discuss
-              v-model:adddiscussVisible="adddiscussvisible"
-              v-model:edit="edit"
-              :isLevel="isLevel"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditDiscussId="EditDiscussId"
-              v-model:projectTaskId="projectTaskId"
-              @changeData="updateTableData"
-            />
-          </div>
-          <!-- 添加讨论侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddActive">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/huo.png" />
-            </div>
-            <div class="text">活动</div>
-          </div>
-          <!-- 添加活动侧弹窗 -->
-          <div>
-            <add-active
-              v-model:addactiveVisible="addactivevisible"
-              v-model:projectId="projectId"
-              v-model:EditActiveId="EditActiveId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:edit="edit"
-              :isLevel="isLevel"
-              v-model:chooseStageId="chooseStageId"
-              @changeData="updateTableData"
-            />
-          </div>
-          <!-- 添加活动侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddEval">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/ce.png" />
-            </div>
-            <div class="text">测评</div>
-          </div>
-          <!-- 添加测评侧弹窗 -->
-          <div>
-            <add-eval
-              v-model:addevalVisible="addevalvisible"
-              @changeData="updateTableData"
-              v-model:edit="edit"
-              :isLevel="isLevel"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:EditEvalId="EditEvalId"
-            />
-          </div>
-          <!-- 添加测评侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddInvist">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/diao.png" />
-            </div>
-            <div class="text">评估</div>
-          </div>
-          <!-- 添加评估侧弹窗 -->
-          <div>
-            <add-invist
-              v-model:addinvistVisible="addinvistvisible"
-              @changeData="updateTableData"
-              v-model:edit="edit"
-              :isLevel="isLevel"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:EditInvistId="EditInvistId"
-            />
-          </div>
-          <!-- 添加评估侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddVote">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tou.png" />
-            </div>
-            <div class="text">投票</div>
-            <!-- 添加投票侧弹窗 -->
+            <!-- 添加在线侧弹窗 -->
             <div>
-              <add-vote
-                v-model:addvoteVisible="addvotevisible"
+              <add-online
+                v-model:addonlineVisible="addonlinevisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditOnlineId="EditOnlineId"
+              />
+            </div>
+            <!-- 添加在线侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerFaceteach">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/mian.png" />
+              </div>
+              <div class="text">面授</div>
+            </div>
+            <!-- 添加面授侧弹窗 -->
+            <div>
+              <add-faceteach
+                v-model:addfaceteachVisible="addfaceteachvisible"
+                v-model:EditEvalId="EditEvalId"
+              />
+            </div>
+            <!-- 添加面授侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddCase">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/an.png" />
+              </div>
+              <div class="text">案例</div>
+            </div>
+            <!-- 添加案例侧弹窗 -->
+            <div>
+              <add-case
+                v-model:addcaseVisible="addcasevisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditCaseId="EditCaseId"
+              />
+            </div>
+            <!-- 添加案例侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddHomework">
+                <img src="../../assets/images/leveladd/zuo.png" />
+              </div>
+              <div class="text">作业</div>
+            </div>
+            <!-- 添加作业侧弹窗 -->
+            <div>
+              <add-homework
+                v-model:addhomeworkVisible="addhomeworkvisible"
+                @changeData="updateTableData"
+                v-model:isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditWorkId="EditWorkId"
+                v-model:projectTaskId="projectTaskId"
+              />
+            </div>
+            <!-- 添加作业侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddTest">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/kao.png" />
+              </div>
+              <div class="text">考试</div>
+            </div>
+            <!-- 添加考试侧弹窗 -->
+            <div>
+              <add-test
+                v-model:addtestVisible="addtestvisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditTestId="EditTestId"
+                v-model:projectTaskId="projectTaskId"
+              />
+            </div>
+            <!-- 添加考试侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddLive">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zhi.png" />
+              </div>
+              <div class="text">直播</div>
+            </div>
+            <!-- 添加直播侧弹窗 -->
+            <div>
+              <add-live
+                v-model:addliveVisible="addlivevisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:edit="edit"
+                v-model:EditLiveId="EditLiveId"
+                v-model:projectTaskId="projectTaskId"
+              />
+            </div>
+            <!-- 添加直播侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddRef">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/wai.png" />
+              </div>
+              <div class="text">外链</div>
+            </div>
+            <!-- 添加外链侧弹窗 -->
+            <div>
+              <add-ref
+                v-model:addrefVisible="addrefvisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:edit="edit"
+                v-model:EditRefId="EditRefId"
+                v-model:projectTaskId="projectTaskId"
+              />
+            </div>
+            <!-- 添加外链侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddDiscuss">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tao.png" />
+              </div>
+              <div class="text">讨论</div>
+            </div>
+            <!-- 添加讨论侧弹窗 -->
+            <div>
+              <add-discuss
+                v-model:adddiscussVisible="adddiscussvisible"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditDiscussId="EditDiscussId"
+                v-model:projectTaskId="projectTaskId"
+                @changeData="updateTableData"
+              />
+            </div>
+            <!-- 添加讨论侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddActive">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/huo.png" />
+              </div>
+              <div class="text">活动</div>
+            </div>
+            <!-- 添加活动侧弹窗 -->
+            <div>
+              <add-active
+                v-model:addactiveVisible="addactivevisible"
+                v-model:projectId="projectId"
+                v-model:EditActiveId="EditActiveId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:chooseStageId="chooseStageId"
+                @changeData="updateTableData"
+              />
+            </div>
+            <!-- 添加活动侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddEval">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/ce.png" />
+              </div>
+              <div class="text">测评</div>
+            </div>
+            <!-- 添加测评侧弹窗 -->
+            <div>
+              <add-eval
+                v-model:addevalVisible="addevalvisible"
                 @changeData="updateTableData"
-                @getData="changeVData"
                 v-model:edit="edit"
                 :isLevel="isLevel"
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
-                v-model:EditVoteId="EditVoteId"
-                v-model:voteId="voteId"
-                v-model:ballotId="ballotId"
+                v-model:EditEvalId="EditEvalId"
               />
             </div>
-            <!-- 添加投票侧弹窗 -->
+            <!-- 添加测评侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddInvist">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/diao.png" />
+              </div>
+              <div class="text">评估</div>
+            </div>
+            <!-- 添加评估侧弹窗 -->
+            <div>
+              <add-invist
+                v-model:addinvistVisible="addinvistvisible"
+                @changeData="updateTableData"
+                v-model:edit="edit"
+                :isLevel="isLevel"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditInvistId="EditInvistId"
+              />
+            </div>
+            <!-- 添加评估侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddVote">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tou.png" />
+              </div>
+              <div class="text">投票</div>
+              <!-- 添加投票侧弹窗 -->
+              <div>
+                <add-vote
+                  v-model:addvoteVisible="addvotevisible"
+                  @changeData="updateTableData"
+                  @getData="changeVData"
+                  v-model:edit="edit"
+                  :isLevel="isLevel"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:EditVoteId="EditVoteId"
+                  v-model:voteId="voteId"
+                  v-model:ballotId="ballotId"
+                />
+              </div>
+              <!-- 添加投票侧弹窗 -->
+            </div>
           </div>
         </div>
-      </div>
-      <div class="boom">
-        <div class="boomcen">
-          <div class="onerow">
-            <div class="taskmain">任务列表</div>
-            <button class="btn" @click="showChangeModal">移动任务到阶段</button>
-            <div class="edit" @click="showdeAll">
-              <img
-                class="editimg"
-                src="../../assets/images/projectadd/delete.png"
-              />
-              <span class="editext">批量删除</span>
-            </div>
-          </div>
-          <!-- 无数据样式 -->
-          <div class="notable" style="display: none">
-            <div class="notablebox">
-              <div class="boxbody">
-                <div class="boximg"></div>
-                <div class="boxtitle">
-                  <span style="color: #ffb64e; font-size: 20px">无课程</span>
-                </div>
-                <div class="boxtitle2">
-                  <span style="color: #878b92">请点击新建开课，创建课程</span>
-                </div>
+        <div class="boom">
+          <div class="boomcen">
+            <div class="onerow">
+              <div class="taskmain">任务列表</div>
+              <button class="btn" @click="showChangeModal">
+                移动任务到阶段
+              </button>
+              <div class="edit" @click="showdeAll">
+                <img
+                  class="editimg"
+                  src="../../assets/images/projectadd/delete.png"
+                />
+                <span class="editext">批量删除</span>
               </div>
-              <div class="smallleft"></div>
-              <div class="smallright"></div>
             </div>
-          </div>
-          <div class="rwbox">
-            <!-- <div class="talk">
+            <!-- 无数据样式 -->
+            <div class="notable" style="display: none">
+              <div class="notablebox">
+                <div class="boxbody">
+                  <div class="boximg"></div>
+                  <div class="boxtitle">
+                    <span style="color: #ffb64e; font-size: 20px">无课程</span>
+                  </div>
+                  <div class="boxtitle2">
+                    <span style="color: #878b92">请点击新建开课，创建课程</span>
+                  </div>
+                </div>
+                <div class="smallleft"></div>
+                <div class="smallright"></div>
+              </div>
+            </div>
+            <div class="rwbox">
+              <!-- <div class="talk">
               <img class="im" src="../../assets/images/leveladd/gan.png" />
               <div class="xu">
                 <span class="yi">已选择</span>
@@ -403,184 +477,184 @@
                 <span class="yi">条</span>
               </div>
             </div> -->
-            <div class="tableBox" style="border: 1px solid #f2f6fc">
-              <div
-                style="
-                  height: 50px;
-                  display: flex;
-                  justify-content: space-between;
-                  align-items: center;
-                  background-color: #eff4fc;
-                  font-size: 14px;
-                  font-weight: 400;
-                  color: #999ba3;
-                  line-height: 36px;
-                  border-bottom: 1px solid #f2f6fc;
-                "
-              >
+              <div class="tableBox" style="border: 1px solid #f2f6fc">
                 <div
                   style="
-                    width: 87px;
-                    text-align: center;
+                    height: 50px;
                     display: flex;
-                    margin-left: 46px;
+                    justify-content: space-between;
+                    align-items: center;
+                    background-color: #eff4fc;
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #999ba3;
+                    line-height: 36px;
+                    border-bottom: 1px solid #f2f6fc;
                   "
                 >
-                  <img
+                  <div
                     style="
-                      width: 16px;
-                      height: 16px;
-                      cursor: pointer;
-                      margin-top: 12px;
+                      width: 87px;
+                      text-align: center;
+                      display: flex;
+                      margin-left: 46px;
                     "
-                    :src="
-                      selectAll === 0
-                        ? require('../../assets/images/notSelect.png')
-                        : selectAll === 1
-                        ? require('../../assets/images/selectAll.png')
-                        : require('../../assets/images/select.png')
-                    "
-                    @click="selectRowAll"
-                  />
-                  <!-- <a-checkbox
+                  >
+                    <img
+                      style="
+                        width: 16px;
+                        height: 16px;
+                        cursor: pointer;
+                        margin-top: 12px;
+                      "
+                      :src="
+                        selectAll === 0
+                          ? require('../../assets/images/notSelect.png')
+                          : selectAll === 1
+                          ? require('../../assets/images/selectAll.png')
+                          : require('../../assets/images/select.png')
+                      "
+                      @click="selectRowAll"
+                    />
+                    <!-- <a-checkbox
                     v-model:checked="selectAll"
                     @change="selectRowAll"
                   >
                   </a-checkbox> -->
-                  <div style="margin-top: 2px; margin-left: 8px">类型</div>
-                </div>
-                <div style="width: 120px; text-align: center">任务名称</div>
-                <div style="width: 120px; text-align: center">必修/选修</div>
-                <div style="width: 87px; text-align: center">时长</div>
-                <div
-                  style="width: 120px; text-align: center; margin-right: 20px"
-                >
-                  操作
-                </div>
-              </div>
-              <draggable
-                v-model="tableData"
-                chosenClass="chosen"
-                ghostClass="ghost"
-                forceFallback="true"
-                group="task"
-                animation="500"
-                @start="onStart"
-                @end="onEnd"
-              >
-                <template #item="{ element }">
+                    <div style="margin-top: 2px; margin-left: 8px">类型</div>
+                  </div>
+                  <div style="width: 120px; text-align: center">任务名称</div>
+                  <div style="width: 120px; text-align: center">必修/选修</div>
+                  <div style="width: 87px; text-align: center">时长</div>
                   <div
-                    style="
-                      height: 50px;
-                      display: flex;
-                      justify-content: space-between;
-                      align-items: center;
-                      border-bottom: 1px solid #f2f6fc;
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: #4f5156;
-                      line-height: 36px;
-                    "
-                    class="tableRow"
+                    style="width: 120px; text-align: center; margin-right: 20px"
                   >
+                    操作
+                  </div>
+                </div>
+                <draggable
+                  v-model="tableData"
+                  chosenClass="chosen"
+                  ghostClass="ghost"
+                  forceFallback="true"
+                  group="task"
+                  animation="500"
+                  @start="onStart"
+                  @end="onEnd"
+                >
+                  <template #item="{ element }">
                     <div
                       style="
-                        width: 87px;
-                        text-align: center;
-                        margin-left: 46px;
-                        position: relative;
+                        height: 50px;
+                        display: flex;
+                        justify-content: space-between;
+                        align-items: center;
+                        border-bottom: 1px solid #f2f6fc;
+                        font-size: 14px;
+                        font-weight: 400;
+                        color: #4f5156;
+                        line-height: 36px;
                       "
+                      class="tableRow"
                     >
-                      <div class="racona">
-                        <div
-                          class="img"
-                          style="
-                            cursor: pointer;
-                            margin-top: 2px;
-                            margin-right: 9px;
-                            position: absolute;
-                            left: -25px;
-                          "
-                        ></div>
-                        <a-checkbox
-                          :id="element.id"
-                          v-model:checked="element.checked"
-                          @change="changeRow"
-                        >
-                        </a-checkbox>
-                        <div style="margin-top: 2px; margin-left: 8px">
-                          {{ element.lei }}
+                      <div
+                        style="
+                          width: 87px;
+                          text-align: center;
+                          margin-left: 46px;
+                          position: relative;
+                        "
+                      >
+                        <div class="racona">
+                          <div
+                            class="img"
+                            style="
+                              cursor: pointer;
+                              margin-top: 2px;
+                              margin-right: 9px;
+                              position: absolute;
+                              left: -25px;
+                            "
+                          ></div>
+                          <a-checkbox
+                            :id="element.id"
+                            v-model:checked="element.checked"
+                            @change="changeRow"
+                          >
+                          </a-checkbox>
+                          <div style="margin-top: 2px; margin-left: 8px">
+                            {{ element.lei }}
+                          </div>
                         </div>
                       </div>
-                    </div>
-                    <div style="width: 120px; text-align: center">
-                      {{ element.creater }}
-                    </div>
-                    <div style="width: 120px; text-align: center">
-                      <div class="opat">
-                        <div class="opacationt clearfix">
-                          <a-switch
-                            style="margin-left: -50px; margin-top: 3px"
-                            v-model:checked="element.checked1"
-                            size="small"
-                            active-color="red"
-                            @click="changeCourseType(element)"
-                          />
-                          <div class="showt clearfix">
-                            <div
-                              class="bi"
-                              :style="{
-                                'z-index': element.checked1 ? 999 : 998,
-                              }"
-                            >
-                              必修
+                      <div style="width: 120px; text-align: center">
+                        {{ element.creater }}
+                      </div>
+                      <div style="width: 120px; text-align: center">
+                        <div class="opat">
+                          <div class="opacationt clearfix">
+                            <a-switch
+                              style="margin-left: -50px; margin-top: 3px"
+                              v-model:checked="element.checked1"
+                              size="small"
+                              active-color="red"
+                              @click="changeCourseType(element)"
+                            />
+                            <div class="showt clearfix">
+                              <div
+                                class="bi"
+                                :style="{
+                                  'z-index': element.checked1 ? 999 : 998,
+                                }"
+                              >
+                                必修
+                              </div>
+                              <div class="xuan">选修</div>
                             </div>
-                            <div class="xuan">选修</div>
+                          </div>
+                        </div>
+                      </div>
+                      <div style="width: 87px; text-align: center">
+                        {{ element.cretime }}分钟
+                      </div>
+                      <div
+                        style="
+                          width: 120px;
+                          text-align: center;
+                          margin-right: 20px;
+                        "
+                      >
+                        <div class="opa">
+                          <div class="opacation">
+                            <span
+                              style="
+                                color: #4ea6ff;
+                                margin-right: 25px;
+                                cursor: pointer;
+                              "
+                              @click="
+                                decideType(
+                                  element.lei,
+                                  element.courseId,
+                                  element.id
+                                )
+                              "
+                            >
+                              编辑
+                            </span>
+                            <span
+                              style="color: #4ea6ff; cursor: pointer"
+                              @click="showDelete(element.id)"
+                            >
+                              删除
+                            </span>
                           </div>
                         </div>
                       </div>
                     </div>
-                    <div style="width: 87px; text-align: center">
-                      {{ element.cretime }}分钟
-                    </div>
-                    <div
-                      style="
-                        width: 120px;
-                        text-align: center;
-                        margin-right: 20px;
-                      "
-                    >
-                      <div class="opa">
-                        <div class="opacation">
-                          <span
-                            style="
-                              color: #4ea6ff;
-                              margin-right: 25px;
-                              cursor: pointer;
-                            "
-                            @click="
-                              decideType(
-                                element.lei,
-                                element.courseId,
-                                element.id
-                              )
-                            "
-                          >
-                            编辑
-                          </span>
-                          <span
-                            style="color: #4ea6ff; cursor: pointer"
-                            @click="showDelete(element.id)"
-                          >
-                            删除
-                          </span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </template>
-              </draggable>
-              <!-- <a-table
+                  </template>
+                </draggable>
+                <!-- <a-table
                 style="border: 1px solid #f2f6fe"
                 :columns="tableDataFunc()"
                 :data-source="tableData"
@@ -595,7 +669,7 @@
                 }"
               /> -->
 
-              <!-- <div class="pa">
+                <!-- <div class="pa">
                 <a-pagination
                   showSizeChanger="true"
                   showQuickJumper="true"
@@ -606,17 +680,34 @@
                   class="pagination"
                 />
               </div> -->
+              </div>
             </div>
-          </div>
 
-          <!-- 编辑在线侧弹窗 -->
-          <div>
-            <edit-online v-model:editonlineVisible="editonlinevisible" />
+            <!-- 编辑在线侧弹窗 -->
+            <div>
+              <edit-online v-model:editonlineVisible="editonlinevisible" />
+            </div>
+            <!-- 编辑在线侧弹窗 -->
           </div>
-          <!-- 编辑在线侧弹窗 -->
         </div>
       </div>
     </div>
+
+    <div class="footbtn">
+      <div class="btnbox">
+        <div class="btn btn2">
+          <div class="btnText">暂存</div>
+        </div>
+        <div class="btn btn2">
+          <div class="btnText">确定</div>
+        </div>
+        <div class="btn btn1">
+          <div class="btnText">取消</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 添加阶段弹窗 -->
     <div>
       <a-modal
         v-model:visible="stage"
@@ -628,6 +719,7 @@
         width="624px"
         height="388px"
         centered="true"
+        @cancel="closeModal"
       >
         <div
           class="modalHeader"
@@ -640,7 +732,9 @@
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px">添加阶段</span>
+            <span class="headerLeftText" style="font-size: 16px"
+              >编辑/添加阶段</span
+            >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
@@ -745,11 +839,11 @@
             <span>您确定要添加阶段吗</span>
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+            <div class="del_btn btn1" @click="closeConfirm">
+              <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn2">
-              <div class="btnText" @click="showModal">确定</div>
+            <div class="del_btn btn2" @click="showModal">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -894,6 +988,38 @@
         </div>
       </div></a-modal
     >
+
+
+      <!-- 是否删除阶段弹窗 -->
+        <a-modal
+      v-model:visible="deleteStageModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      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="closeDeleteStage"></div>
+          </div>
+          <div class="body">
+            <span>您确定要删除此阶段</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1" @click="closeDeleteStage">
+              <div class="btnText" >取消</div>
+            </div>
+            <div class="del_btn btn2" @click="deleteStage">
+              <div class="btnText" >确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -1161,6 +1287,10 @@ export default {
       selectRow: [], //选择行
       curLevel: [], //阶段名称
       selectAll: 0, //0：未选择，1：全选，2：部分选择
+
+      updateStageID: null, //编辑阶段id
+      deleteStageId:null,//删除阶段的id
+      deleteStageModal:false,//删除阶段弹窗
     });
     console.log("projectId", state.projectId);
     const selectProjectName = (value, index) => {
@@ -1172,31 +1302,7 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
-    //添加阶段
-    const editStage = () => {
-      if (!state.valuesname) {
-        message.destroy();
-        return message.warning("请输入阶段名称");
-      }
-      let obj = {
-        name: state.valuesname,
-        projectId: state.projectId,
-        remark: state.valuesnotice,
-      };
-      apistage
-        .editStage(obj)
-        .then((res) => {
-          console.log("添加阶段成功", res);
-          (state.valuesname = ""),
-            (state.valuesnotice = ""),
-            (state.stage = false);
-          message.default();
-          message.success("添加阶段成功");
-        })
-        .catch((err) => {
-          console.log("添加阶段失败", err);
-        });
-    };
+
     // 把数据放到state里
     const getTableData = (tableData) => {
       let data = tableData;
@@ -1447,11 +1553,10 @@ export default {
             let stage = localStorage.getItem("stageId")
               ? localStorage.getItem("stageId")
               : null;
-            if (stage !== null) {
+            if (stage !== "null") {
               state.chooseStageId = stage;
             } else {
               state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
-              console.log(state.chooseStageId, 1111);
             }
           }
         })
@@ -1565,12 +1670,7 @@ export default {
     //     40 +
     //     "px";
     // };
-    //添加阶段详情
-    const showModal = () => {
-      state.stage = true;
-      //关闭确认框
-      closeConfirm();
-    };
+
     const showModal1 = () => {
       //关闭确认框
       state.deleteModal = false;
@@ -1578,8 +1678,105 @@ export default {
       message.success("删除成功");
       getTask();
     };
+    //关闭添加阶段弹窗
     const closeModal = () => {
       state.stage = false;
+      state.valuesname = "";
+      state.valuesnotice = "";
+      state.updateStageID = null;
+    };
+    //显示添加阶段弹窗
+    const showModal = (element) => {
+      state.stage = true;
+      //关闭确认框
+      closeConfirm();
+
+      if (element) {
+        state.valuesname = element.tit;
+        state.valuesnotice = element.name;
+        state.updateStageID = element.id;
+      }
+    };
+    //添加阶段
+    const editStage = () => {
+      if (!state.valuesname) {
+        message.destroy();
+        return message.warning("请输入阶段名称");
+      }
+      if (state.updateStageID) {
+        let obj = {
+          name: state.valuesname,
+          projectId: state.projectId,
+          remark: state.valuesnotice,
+          stageId: state.updateStageID,
+        };
+        apistage
+          .editStage(obj)
+          .then((res) => {
+            console.log("修改阶段成功", res);
+            state.valuesname = "";
+            state.valuesnotice = "";
+           closeModal()
+            state.updateStageID = null;
+            message.destroy();
+            message.success("修改阶段成功");
+            getTask();
+          })
+          .catch((err) => {
+            console.log("添加阶段失败", err);
+          });
+      } else {
+        let obj = {
+          name: state.valuesname,
+          projectId: state.projectId,
+          remark: state.valuesnotice,
+        };
+        apistage
+          .editStage(obj)
+          .then((res) => {
+            console.log("添加阶段成功", res);
+            state.valuesname = ""
+              state.valuesnotice = ""
+             closeModal()
+            message.destroy();
+            message.success("添加阶段成功");
+            getTask();
+          })
+          .catch((err) => {
+            console.log("添加阶段失败", err);
+          });
+      }
+    };
+
+
+//打开删除阶段弹窗
+const showDeleteStage=(id)=>{
+
+state.deleteStageId=id
+ state.deleteStageModal=true
+}
+//关闭删除阶段弹窗
+const closeDeleteStage=()=>{
+  state.deleteStageId=null
+  state.deleteStageModal=false
+}
+ //删除阶段
+    const deleteStage = () => {
+      console.log("chapterId", state.deleteStageId);
+      let obj = {
+        stageId: state.deleteStageId,
+      };
+      apistage
+        .deleteStage(obj)
+        .then((res) => {
+          console.log("删除阶段成功", res);
+          message.success('删除阶段成功')
+          closeDeleteStage()
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除阶段失败", err);
+        });
     };
     onMounted(() => {
       document.getElementsByTagName("main")[0].style.background =
@@ -1871,6 +2068,10 @@ export default {
       showdeAll,
       closeDeAll,
       handleChangeStage,
+
+      showDeleteStage,
+      closeDeleteStage,
+      deleteStage,
     };
   },
 };
@@ -2297,6 +2498,7 @@ export default {
 .taskadd {
   width: 100%;
   display: flex;
+  flex-direction: column;
   min-width: 933px;
   // min-width: 1200px;
   // overflow-x: hidden;
@@ -2363,53 +2565,76 @@ export default {
         width: 208px;
         display: flex;
         flex-direction: column;
-        align-items: center; // background-color: #bfa;
+        align-items: center;
 
         .ghost {
           // background-color: red;
           opacity: 0 !important;
         }
-        .item {
+        .items {
           width: 171px;
-          height: 83px;
-          display: flex;
+          // height: 83px;
           background: rgba(255, 182, 78, 0.1);
           border: 1px solid #ffb64e;
           opacity: 0.45;
           border-radius: 8px;
-          margin-bottom: 17px;
+          margin-bottom: 16px;
           align-items: center;
-          position: relative;
-          .itemle {
-            margin-left: 17px;
-            .tit {
-              color: black;
-              // color: red;
-              font-size: 14px;
-              margin-bottom: 8px;
-              font-weight: bold;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              overflow: hidden;
-              width: 100px;
+          padding: 16px;
+          opacity: 0.5;
+          cursor: pointer;
+          .items1 {
+            margin-bottom: 12px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            .boxs_left {
+              display: flex;
+              align-items: center;
+              .script {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                width: 56px;
+                height: 24px;
+                background: #ffb64e;
+                border-radius: 6px;
+                margin-right: 12px;
+                white-space: nowrap;
+              }
+              .imgIcon {
+                width: 16px;
+                height: 16px;
+                background-image: url(@/assets/images/leveladd/edit1.png);
+                background-size: 100% 100%;
+              }
             }
-            .name {
-              font-size: 14px;
-              color: #878b92;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              overflow: hidden;
-              width: 100px;
+            .boxs_right {
+              .imgIcon {
+                width: 16px;
+                height: 16px;
+                background-image: url(@/assets/images/leveladd/delete.png);
+                background-size: 100% 100%;
+              }
             }
           }
-          .itemri {
-            display: flex;
-            flex-direction: column;
-            position: absolute;
-            right: 16px;
+          .items2 {
+            .nname {
+              width: 140px;
+              // overflow: hidden;
+              // text-overflow: ellipsis;
+              // white-space: nowrap;
+              font-weight: bold;
+
+              overflow: hidden;
+              text-overflow: ellipsis;
+              -webkit-line-clamp: 2;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+            }
           }
         }
-        .bgcactive {
+        .active {
           opacity: 1;
           // transition: all 0.5s;
         }
@@ -2476,8 +2701,40 @@ export default {
           display: flex;
           align-items: center;
           .select {
-            margin-right: 50px;
-            // margin-bottom: 20px;
+            display: flex;
+            align-items: center;
+            white-space: nowrap;
+            margin-right: 56px;
+            .inputbox {
+              display: flex;
+              align-items: center;
+              border: 1px solid #c7cbd2;
+              width: 238px;
+              height: 40px;
+              border-radius: 8px;
+              input {
+                border: none;
+                outline: none;
+              }
+              .bottonbox {
+                width: 100px;
+                height: 40px;
+                background: #409eff;
+                border-radius: 8px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                cursor: pointer;
+                flex-shrink: 0;
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #ffffff;
+                  line-height: 36px;
+                  margin-left: 5px;
+                }
+              }
+            }
           }
           .line {
             height: 60px;
@@ -2877,5 +3134,51 @@ export default {
       margin-left: 10px;
     }
   }
+  .footbtn {
+    width: 100%;
+    height: 80px;
+    margin-top: 16px;
+    // flex: 1;
+    background-color: #fff;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+    display: flex;
+    justify-content: end;
+    .btnbox {
+      display: flex;
+      margin-right: 36px;
+      height: 80px;
+      .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;
+        flex-shrink: 0;
+        margin: 21px 0px 19px 14px;
+        cursor: pointer;
+        white-space: nowrap;
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btn1 {
+        background-color: #409eff;
+        .btnText {
+          color: #ffffff;
+        }
+      }
+      .btn2 {
+        background-color: #ffffff;
+        .btnText {
+          color: #409eff;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 38f4eb9c..8f712df0 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2034,7 +2034,7 @@ export default {
       sourceBelong: null, //资源归属
       remark: null, //项目说明
       level: null, //项目级别
-      systemId: null, //培训体系
+      systemId: null, //培训分类
       picUrl: null,
       parentId: null,
     });
@@ -2413,79 +2413,17 @@ export default {
     };
 
     //学员管理列表操作
-    const studentData = () => {
-      let arr = state.tabledata;
-      console.log(arr, "学员管理");
-      arr.map((value) => {
-        value.operation = (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
-            <div
-              class="studentopea1"
-              onClick={() => {
-                if (value.excellent === false) {
-                  state.canclestu = true;
-                  console.log("youxiu", value.studentId);
-                  state.changeGoods.push(value.studentId);
-                } else if (value.excellent === true) {
-                  state.canclestu1 = true;
-                  console.log("youxiu", value.studentId);
-                  state.changeGoods.push(value.studentId);
-                }
-              }}
-            >
-              {value.excellent ? "取消优秀" : "优秀学员"}
-            </div>
-
-            <div
-              class="studentopea2"
-              onClick={() => {
-                state.Seevisible = true;
-                console.log(value.studentId, "点击了查看");
-                state.checkStuId = value.studentId;
-              }}
-            >
-              查看
-            </div>
-            <div class="studentSelect">
-              <a-select
-                style="width: 50px"
-                value="更多"
-                // options={state.projectNameList}
-                dropdownClassName="tabledropdown"
-              >
-                <a-select-option value="换组" label="换组">
-                  <div
-                    onClick={() => {
-                      state.Changevisible = true;
-                    }}
-                  >
-                    换组
-                  </div>
-                </a-select-option>
-                <a-select-option value="删除" label="删除">
-                  <div
-                    onClick={() => {
-                      console.log("点击了111", value.studentId);
-                      showDeleteOne(value.studentId);
-                    }}
-                  >
-                    删除
-                  </div>
-                </a-select-option>
-              </a-select>
-            </div>
-          </div>
-        );
-      });
-      state.tabledata = arr;
-    };
-    studentData();
+    // const studentData = () => {
+    //   let arr = state.tabledata;
+    //   console.log(arr, "学员管理");
+    //   arr.map((value) => {
+    //     value.operation = (
+       
+    //     );
+    //   });
+    //   state.tabledata = arr;
+    // };
+    // studentData();
     const studentColumns = () => {
       const tablecolumns = [
         {
@@ -2592,6 +2530,75 @@ export default {
           // width: 60,
           align: "center",
           className: "h",
+           scopedSlots: { customRender: "action" }, //引入的插槽
+             customRender: (text) => {
+            // console.log(text);
+            return (
+                 <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="studentopea1"
+              onClick={() => {
+                if (text.record.excellent === false) {
+                  state.canclestu = true;
+                  console.log("youxiu", text.record.studentId);
+                  state.changeGoods.push(text.record.studentId);
+                } else if (text.record.excellent === true) {
+                  state.canclestu1 = true;
+                  console.log("youxiu", text.record.studentId);
+                  state.changeGoods.push(text.record.studentId);
+                }
+              }}
+            >
+              {text.record.excellent ? "取消优秀" : "优秀学员"}
+            </div>
+
+            <div
+              class="studentopea2"
+              onClick={() => {
+                state.Seevisible = true;
+                console.log(text.record.studentId, "点击了查看");
+                state.checkStuId = text.record.studentId;
+              }}
+            >
+              查看
+            </div>
+              <div class="studentSelect">
+              <a-select
+                style="width: 50px"
+                value="更多"
+                // options={state.projectNameList}
+                dropdownClassName="tabledropdown"
+              >
+                <a-select-option value="换组" label="换组">
+                  <div
+                    onClick={() => {
+                      state.Changevisible = true;
+                    }}
+                  >
+                    换组
+                  </div>
+                </a-select-option>
+                <a-select-option value="删除" label="删除">
+                  <div
+                    onClick={() => {
+                      // console.log("点击了111", text);
+                      showDeleteOne(text.record.studentId);
+                    }}
+                  >
+                    删除
+                  </div>
+                </a-select-option>
+              </a-select>
+            </div>
+          </div>
+           
+              )}
         },
       ];
       return tablecolumns;
@@ -2860,7 +2867,7 @@ export default {
         if (leng > 0) {
           let arr = res.data.data.rows;
           getTableDataList(arr);
-          studentData();
+          // studentData();
         }
       });
     };
@@ -3136,7 +3143,7 @@ export default {
       createG,
       resetGroupName,
       searchGroup,
-      studentData,
+      // studentData,
       cancelyou,
       cancelcanyou,
       changePaginationStu,

From c95540a401a1a890a8f8ac5c4abb47dc9aedbeb9 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Fri, 18 Nov 2022 07:16:59 +0800
Subject: [PATCH 66/90] =?UTF-8?q?fix:=E5=88=A0=E9=99=A412=E4=B8=AA?=
 =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=9A=84console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue     | 58 ++++++-------------
 src/components/drawers/AddCase.vue       | 38 ++++---------
 src/components/drawers/AddDiscuss.vue    | 60 +++-----------------
 src/components/drawers/AddEval.vue       | 35 +++++-------
 src/components/drawers/AddFaceteach.vue  |  4 +-
 src/components/drawers/AddHomework.vue   | 36 ++----------
 src/components/drawers/AddInvist.vue     | 21 +++----
 src/components/drawers/AddLive.vue       | 72 +++++-------------------
 src/components/drawers/AddOnline.vue     | 36 ++++--------
 src/components/drawers/AddRef.vue        | 53 +++++------------
 src/components/drawers/AddTest.vue       | 21 ++-----
 src/components/drawers/AddVote1.vue      |  3 +-
 src/components/drawers/CreVote.vue       | 46 ++++-----------
 src/components/vote/AddVote.vue          | 34 +++++------
 src/components/vote/CreateVote.vue       | 11 +---
 src/components/vote/VoteQuestion.vue     |  3 +-
 src/components/vote/VoteQuestionItem.vue |  1 -
 src/views/learningpath/LevelAdd.vue      |  1 -
 src/views/projectcenter/TaskPage.vue     |  5 ++
 19 files changed, 146 insertions(+), 392 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 7b0db77d..3951753b 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -222,28 +222,12 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexActivity";
 import * as apiTask from "../../api/indexTaskadd";
 import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
-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: "AddActive",
   // components: {
@@ -299,7 +283,6 @@ export default {
     },
   },
   setup(props, ctx) {
-    //console.log("学习路径",props.isStudiscuss);
     const state = reactive({
       inputV1: "",
       inputV2: "",
@@ -330,17 +313,9 @@ export default {
       localStorage.setItem("chapterId", props.isactive);
     };
     const queryActive = () => {
-      console.log(
-        "props.EditActiveId======",
-        props.EditActiveId,
-        props.chooseStageId,
-        props.routerTaskId
-      );
       api
         .getActivity(props.EditActiveId)
         .then((res) => {
-          console.log("获取讨论信息成功", res.data.data.standardSettings);
-
           //更新讨论信息
           state.inputV1 = res.data.data.activityName;
           state.textV1 = res.data.data.activityNotice;
@@ -357,8 +332,7 @@ export default {
             dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
           ];
         })
-        .catch((err) => {
-          console.log("获取讨论信息失败", err);
+        .catch(() => {
         });
     };
     const afterVisibleChange = (bool) => {
@@ -382,11 +356,11 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 9,
         })
-          .then((res) => {
-            console.log("新增关卡任务成功", res);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
-          .catch((err) => {
-            console.log("新增关卡任务失败", err);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask
@@ -399,14 +373,14 @@ export default {
             stageId: props.chooseStageId,
             type: 9,
           })
-          .then((res) => {
-            console.log("更新任务列表成功", res);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
           })
-          .catch((err) => {
-            console.log("更新任务列表失败", err);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("模板库更新更新任务列表");
+        console.log("");
       }
     };
     //创建活动
@@ -455,9 +429,10 @@ export default {
             closeDrawer();
             updateTask(res);
             ctx.emit("changeData", false);
+            message.success("更新成功");
           })
-          .catch((err) => {
-            console.log("更新失败", err);
+          .catch(() => {
+            message.error("更新失败");
           });
       } else {
         //新建活动信息
@@ -469,8 +444,8 @@ export default {
             updateTask(res);
             ctx.emit("changeData", false);
           })
-          .catch((err) => {
-            console.log("创建失败", err);
+          .catch(() => {
+            message.error("创建失败");
           });
       }
     };
@@ -479,7 +454,6 @@ export default {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       cloradio1,
       updateActivityInfo,
     };
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index ba1475b3..9c98a026 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -160,8 +160,7 @@ export default {
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
     };
     const tableDataFunc = () => {
       const columns = [
@@ -192,16 +191,7 @@ export default {
       return columns;
     };
     const rowSelection = {
-      onSelect: (selectedRows, selected, selectedRowKeys) => {
-        console.log(
-          "selectedRowKeys",
-          selectedRowKeys,
-          "selectedRows",
-          selectedRows,
-          "selected",
-          selected
-        );
-        console.log(selectedRows.assessmentId);
+      onSelect: (selectedRows) => {
         state.assessmentId = selectedRows.assessmentId;
         state.assessmentName = selectedRows.name;
       },
@@ -238,18 +228,14 @@ export default {
         .then((res) => {
           let arr = res.data.data.rows;
           if (res.status === 200) {
-            // console.log("获取案例信息", res.data.data);
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
           }
         })
-        .catch((err) => {
-          console.log("获取全部在线信息接口失败", err);
-          // state.createLoading = false;
+        .catch(() => {
         });
     };
     const updateTask = () => {
-      console.log("jinlaile=================", state.assessmentName);
       if (props.isLevel == 1) {
         RouterEditTask({
           chapterId: props.isactive,
@@ -259,18 +245,16 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 3,
         })
-          .then((res) => {
-            console.log(res, 11111);
+          .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
           })
-          .catch((err) => {
-            console.log(err, 1111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
-        console.log("=========projectTaskId", props.projectTaskId);
         apiTask
           .addTask({
             courseId: state.assessmentId,
@@ -280,16 +264,16 @@ export default {
             stageId: props.chooseStageId,
             type: 3,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后111", res.data, 11111);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
           })
-          .catch((err) => {
-            console.log(err, 111111);
+          .catch(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("模板库");
+        console.log("");
       }
     };
     //重置案例信息
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index 7cd9a3c9..ca05cb6c 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -71,31 +71,13 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexDiscuss";
 import * as apiTask from "../../api/indexTaskadd";
 import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
-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: "AddDiscuss",
-  // components: {
-  // },
   props: {
     adddiscussVisible: {
       type: Boolean,
@@ -147,7 +129,6 @@ export default {
     },
   },
   setup(props, ctx) {
-    console.log("学习路径", props.isStudiscuss);
     const state = reactive({
       inputV1: "",
       inputV2: "",
@@ -162,11 +143,6 @@ export default {
       } else {
         state.discussSettings = "false";
       }
-      console.log(
-        "state.checkedC1=====",
-        state.discussSettings,
-        state.discussSettings == "true"
-      );
     };
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
@@ -174,7 +150,6 @@ export default {
       state.inputV1 = "";
       state.textV1 = "";
       message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-      // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
@@ -184,22 +159,13 @@ export default {
         api
           .getDiscussDetail({ discussId: props.EditDiscussId })
           .then((res) => {
-            console.log("获取讨论信息成功", res.data.data);
             //更新讨论信息
             state.inputV1 = res.data.data.discussName;
             state.textV1 = res.data.data.discussExplain;
             state.checkedC1 =
               res.data.data.discussSettings == "true" ? true : false;
-            console.log(
-              "props.EditDiscussId",
-              res.data.data.discussSettings,
-              "===",
-              res.data.data.discussSettings == "true",
-              state.checkedC1
-            );
           })
-          .catch((err) => {
-            console.log("获取讨论信息失败", err);
+          .catch(() => {
           });
       }
     };
@@ -218,11 +184,11 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 8,
         })
-          .then((res) => {
-            console.log("新增关卡任务失败", res);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
-          .catch((err) => {
-            console.log("新增关卡任务失败", err);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask.addTask({
@@ -233,7 +199,7 @@ export default {
           type: 8,
         });
       } else if (props.isLevel == 3) {
-        console.log("模板库任务");
+        console.log("");
       }
     };
     const updateDiscussInfo = () => {
@@ -248,7 +214,6 @@ export default {
         discussId: props.edit ? props.EditDiscussId : 0, //讨论Id
         projectId: 0, //项目id,接口多余字段，
       };
-      console.log("dianwanle -======", String(state.checkedC1));
       if (props.edit) {
         api
           .updateDiscuss(obj)
@@ -256,11 +221,8 @@ export default {
             updateTask(res);
             closeDrawer();
             ctx.emit("changeData", false);
-            console.log("更新成功", res);
-            console.log("项目任务ID", props.projectTaskId);
           })
-          .catch((err) => {
-            console.log("更新失败", err);
+          .catch(() => {
           });
       } else {
         api
@@ -269,11 +231,8 @@ export default {
             updateTask(res);
             closeDrawer();
             ctx.emit("changeData", false);
-            console.log("创建成功", res);
-            console.log("项目任务ID", props.projectTaskId);
           })
-          .catch((err) => {
-            console.log("创建失败", err);
+          .catch(() => {
           });
       }
     };
@@ -281,7 +240,6 @@ export default {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       updateDiscussInfo,
       checkRadio,
     };
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index b934924f..cfae1b59 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -188,13 +188,11 @@ export default {
     };
     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"),
@@ -202,10 +200,8 @@ export default {
           ];
           state.evaluationTypeId = res.data.data.evaluationTypeId;
           state.evaluationTypeName = res.data.data.evaluationTypeName;
-          //state.description =
         })
-        .catch((err) => {
-          console.log(err);
+        .catch(() => {
         });
     };
     const updateTask = (res) => {
@@ -219,11 +215,11 @@ export default {
             stageId: props.chooseStageId,
             type: 10,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后", res.data);
+          .then(( ) => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           })
-          .catch((err) => {
-            console.log(err);
+          .catch(( ) => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         RouterEditTask({
@@ -234,14 +230,14 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 10,
         })
-          .then((res) => {
-            console.log("调用项目添加接口后", res.data);
+          .then(( ) => {
+            message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
           })
-          .catch((err) => {
-            console.log(err);
+          .catch(( ) => {
+            message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("模板库任务");
+        console.log("");
       }
     };
     //创建或编辑测评信息
@@ -266,7 +262,6 @@ export default {
         evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
         evaluationTypeId: state.evaluationTypeId,
         evaluationTypeName: state.evaluationTypeName,
-        //state.description
       };
       if (props.edit) {
         api
@@ -277,20 +272,20 @@ export default {
             closeDrawer();
             ctx.emit("changeData", false);
           })
-          .catch((err) => {
-            console.log(err);
+          .catch(() => {
+            message.error("创建失败");
           });
       } else {
         api
           .updateEvaluation(obj)
           .then((res) => {
             updateTask(res);
-            message.success("创建成功");
+            message.success("编辑成功");
             closeDrawer();
             ctx.emit("changeData", false);
           })
-          .catch((err) => {
-            console.log(err);
+          .catch(( ) => {
+            message.error("编辑失败");
           });
       }
     };
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index a6b099c3..21258240 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -388,7 +388,6 @@ export default {
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
       if (bool) {
         queryFaceTeach();
       }
@@ -418,8 +417,7 @@ export default {
     const updateTask = () => {};
     //新建或编辑面授
     const updateFaceTeach = () => {};
-    const upDateTable = (data) => {
-      console.log("选择了课程", data);
+    const upDateTable = () => {
     };
     return {
       ...toRefs(state),
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index e1149ca0..1f5f6d76 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -117,26 +117,8 @@ import {
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 
-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: "AddHomework",
-  // components: {
-  // },
   props: {
     addhomeworkVisible: {
       type: Boolean,
@@ -243,14 +225,12 @@ export default {
     //     span: 14,
     //   },
     // };
-    const handleFinish = (values) => {
-      console.log(values);
+    const handleFinish = () => {
       updteHomeWork();
     };
 
-    const handleFinishFailed = (errors) => {
-      console.log(errors);
-      // message.error("handleFinishFailed");
+    const handleFinishFailed = () => {
+      message.error("handleFinishFailed");
     };
 
     const resetForm = () => {
@@ -283,12 +263,11 @@ export default {
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = (bool) => {
+    const afterVisibleChange = () => {
       if (props.addhomeworkVisible && props.edit) {
         // 该页面显示同时 edit为true 时，发送查询请求,
         queryWork();
       }
-      console.log("state", bool);
     };
 
     // 新增任务
@@ -327,16 +306,12 @@ export default {
       state.addLoading = true;
       queryWorkDetailById({ workId: props.EditWorkId })
         .then((res) => {
-          console.log(
-            dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD")
-          );
           formState.workName = res.data.data.workName;
           formState.workRequirement = res.data.data.workRequirement;
           formState.choosedTime = [
             dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"),
             dayjs(res.data.data.submitEndTime, "YYYY-MM-DD"),
           ];
-          console.log(res);
           state.addLoading = false;
         })
         .catch(() => {
@@ -383,14 +358,13 @@ export default {
             message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("模板库更新更新任务列表");
+        console.log("");
       }
     };
 
     return {
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       handleChange,
       fileList,
       formState,
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index e6d9fa53..212678fc 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -143,7 +143,6 @@ export default {
     });
     const getCheckedAss = (ass) => {
       state.assessment = ass;
-      console.log("checed===", state.assessment);
     };
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
@@ -156,8 +155,7 @@ export default {
     const checkAssDrawer = () => {
       state.assessmentVisible = true;
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
       state.assessmentId = null;
       state.assessmentName = "";
       state.assessment = null;
@@ -176,15 +174,14 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 11,
         })
-          .then((res) => {
-            console.log(res, 11111);
+          .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
           })
-          .catch((err) => {
-            console.log(err, 1111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask
@@ -196,16 +193,16 @@ export default {
             stageId: props.chooseStageId,
             type: 11,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后111", res.data, 11111);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
           })
-          .catch((err) => {
-            console.log(err, 111111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("模板库更新更新任务列表");
+        console.log("");
       }
     };
 
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 16f64910..5f250ccb 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -327,29 +327,8 @@ function getBase64(img, callback) {
   reader.addEventListener("load", () => callback(reader.result));
   reader.readAsDataURL(img);
 }
-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: "AddLive",
   props: {
@@ -430,7 +409,6 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
       ctx.emit("update:edit", false);
-      console.log(props, "props");
       state.radioV1 = "";
       state.playback = false;
       state.inputV6 = "";
@@ -449,8 +427,7 @@ export default {
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = (bool) => {
-      console.log("props.edit===================", props.edit, bool);
+    const afterVisibleChange = () => {
       if (props.edit) {
         queryLive();
       }
@@ -464,23 +441,19 @@ export default {
           searchStartTime: "",
         })
         .then((res) => {
-          console.log(res.data.data.rows, "获取全部评估信息");
           res.data.data.rows.forEach((item) => {
             let obj = item;
             obj.value = item.assessmentId;
             obj.label = item.assessmentName;
             state.assessment.push(obj);
           });
-          console.log("eeee", state.assessment);
         });
     };
     const queryLive = () => {
       let d = props.EditLiveId;
-      console.log("直播查询=======", d);
       api
         .getLiveBroadcastInfor({ liveId: d })
         .then((res) => {
-          // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
           state.inputV1 = res.data.data.liveName;
           state.time = [
             dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
@@ -498,7 +471,6 @@ export default {
           state.radioV1 = res.data.data.standardSettings;
           //state.= res.data.data
           state.assessmentId = res.data.data.assessmentId;
-          console.log("查询成功=====inputv1", state.inputV1);
         })
         .catch(() => {
           message.error(`查询失败`);
@@ -506,7 +478,6 @@ export default {
     };
 
     const cloradio1 = (value) => {
-      console.log(value.target._value); //点击的选项
       if (state.radioV1 === value.target._value) {
         state.radioV1 = "";
       }
@@ -560,13 +531,12 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 6,
         })
-          .then((res) => {
-            console.log(res, 11111);
+          .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
           })
-          .catch((err) => {
-            console.log(err, 1111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask
@@ -579,16 +549,15 @@ export default {
             stageId: props.chooseStageId,
             type: 6,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后", res.data);
-            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
           })
-          .catch((err) => {
-            console.log(err);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
-        console.log("mobnku");
+        console.log("");
       }
     };
     //创建直播
@@ -640,31 +609,25 @@ export default {
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
       };
-      console.log("zhibo-==========", props.EditLiveId);
       if (props.edit) {
         api
           .updateLiveBroadcastMessage(state.obj)
           .then((res) => {
-            console.log("直播编辑成功", res.data.data);
             message.success("提交成功");
             updateTask(res);
             closeDrawer();
           })
-          .catch((err) => {
-            console.log(err, 2222);
+          .catch(() => {
           });
       } else {
         api
           .createLiveBroadcast(state.obj)
           .then((res) => {
-            console.log("调用添加直播接口后", res.data.data);
-            // console.log(state, 2222);
             message.success("提交成功");
             updateTask(res);
             closeDrawer();
           })
-          .catch((err) => {
-            console.log(err, 2222);
+          .catch(() => {
           });
       }
     };
@@ -685,26 +648,17 @@ export default {
       } else {
         state.discussSettings = "false";
       }
-      console.log(
-        "state.checkedC1=====",
-        state.discussSettings,
-        state.discussSettings == "true"
-      );
     };
     const filterOption = (input, option) => {
       return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0;
     };
-    const handleChangeAssessment = (value, option) => {
-      console.log("选择了", value, option);
+    const handleChangeAssessment = (option) => {
       state.assessmentId = option.assessmentId;
     };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      options1,
-      // columns1,
-      rowSelection,
       cloradio1,
       handleChange,
       beforeUpload,
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index e58e5bfc..64dad65f 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -185,8 +185,7 @@ export default {
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
     };
     const tableDataFunc = () => {
       const columns = [
@@ -240,23 +239,13 @@ export default {
     const rowSelection = {
       checkStrictly: false,
       onSelectAll: (selected) => {
-        console.log(selected);
         if (selected == true) {
           state.RowsNum = state.tableDataTotal;
         } else {
           state.RowsNum = 0;
         }
       },
-      onSelect: (selectedRows, selected, selectedRowKeys) => {
-        console.log(
-          "selectedRowKeys",
-          selectedRowKeys,
-          "selectedRows",
-          selectedRows,
-          "selected",
-          selected
-        );
-        console.log(selectedRows.assessmentId);
+      onSelect: (selectedRows, selected) => {
         if (selected == true) {
           state.RowsNum++;
         } else {
@@ -298,14 +287,11 @@ export default {
         .then((res) => {
           let arr = res.data.data.rows;
           if (res.status === 200) {
-            // console.log("获取在线信息", res.data.data);
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
           }
         })
-        .catch((err) => {
-          console.log("获取全部在线信息接口失败", err);
-          // state.createLoading = false;
+        .catch(() => {
         });
     };
     const updateTask = () => {
@@ -318,18 +304,16 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 1,
         })
-          .then((res) => {
-            console.log(res, 11111);
+          .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
           })
-          .catch((err) => {
-            console.log(err, 1111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
-        console.log("=========projectTaskId", props.projectTaskId);
         apiTask
           .addTask({
             courseId: state.assessmentId,
@@ -339,13 +323,13 @@ export default {
             stageId: props.chooseStageId,
             type: 1,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后111", res.data, 11111);
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
           })
-          .catch((err) => {
-            console.log(err, 111111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
         console.log("");
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index d9ac10ca..ab154f9b 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -87,32 +87,13 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexExternalChain";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { RouterEditTask } from "@/api/indexTask";
-//import { query } from "express";
-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: "AddRef",
-  // components: {
-  // },
   props: {
     addrefVisible: {
       type: Boolean,
@@ -167,10 +148,8 @@ export default {
       title: null,
     });
     const closeDrawer = () => {
-      console.log(props, 1111);
       ctx.emit("update:addrefVisible", false);
       ctx.emit("update:edit", false);
-      console.log("props", props.routerId);
       state.inputV2 = "";
       state.inputV1 = "";
       state.textV1 = "";
@@ -179,8 +158,7 @@ export default {
       localStorage.setItem("chapterId", props.isactive);
     };
 
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
 
       if (props.edit) {
         queryRef();
@@ -204,15 +182,14 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 7,
         })
-          .then((res) => {
-            console.log(res, 11111);
+          .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
           })
-          .catch((err) => {
-            console.log(err, 1111);
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
         apiTask
@@ -224,13 +201,13 @@ export default {
             stageId: props.chooseStageId,
             type: 7,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后111", res.data, 11111);
+          .then(() => {
+            message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
           })
-          .catch((err) => {
-            console.log(err, 111111);
+          .catch(() => {
+            message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
         console.log("");
@@ -254,7 +231,6 @@ export default {
         linkId: props.edit ? props.EditRefId : 0,
         linkName: state.inputV1,
       };
-      console.log("编辑的id========", props.EditRefId);
       if (props.edit) {
         api
           .updateLinks(obj)
@@ -262,7 +238,9 @@ export default {
             message.success("编辑成功");
             updateTask(res);
           })
-          .catch((err) => console.log(err));
+          .catch(() => {
+
+          });
       } else {
         api
           .createExternalChain(obj)
@@ -270,7 +248,9 @@ export default {
             message.success("提交成功");
             updateTask(res);
           })
-          .catch((err) => console.log(err));
+          .catch(() => {
+
+          });
       }
     };
     // 查询任务
@@ -279,11 +259,9 @@ export default {
       api
         .getLink({ linkId: d })
         .then((res) => {
-          // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
           state.inputV1 = res.data.data.linkName;
           state.inputV2 = res.data.data.linkAddress;
           state.textV1 = res.data.data.linkDescription;
-          console.log("查询成功=====inputv1", state.inputV1);
         })
         .catch(() => {
           message.error(`查询失败`);
@@ -293,7 +271,6 @@ export default {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       handleFinish,
       handleFinishFailed,
       updateRef,
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 1da3069a..923d0c82 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -547,14 +547,12 @@ export default {
         value: "eng",
       },
     ]);
-    const handleFinish = (values) => {
-      console.log(values);
+    const handleFinish = () => {
       updateTest();
     };
 
-    const handleFinishFailed = (errors) => {
-      console.log(errors);
-      // message.error("handleFinishFailed");
+    const handleFinishFailed = () => {
+      message.error("handleFinishFailed");
     };
 
     const resetForm = () => {
@@ -573,17 +571,14 @@ export default {
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = (bool) => {
-      console.log(props.edit);
+    const afterVisibleChange = () => {
       if (props.addtestVisible && props.edit) {
         // 该页面显示同时 edit为true 时，发送查询请求,
         queryTest();
       }
-      console.log("formState", bool);
     };
     const queryTest = () => {
       state.addLoading = true;
-      console.log(props.EditTestId);
       queryExaminationDetailById({ examinationId: props.EditTestId })
         .then((res) => {
           formState.examinationName = res.data.data.examinationName;
@@ -610,7 +605,6 @@ export default {
           } else {
             formState.choosedTime = [];
           }
-          console.log(res);
         })
         .catch(() => {
           message.error(`查询失败`);
@@ -672,16 +666,14 @@ export default {
           type: 5,
         };
         RouterEditTask(editObj1)
-          .then((res) => {
-            console.log(` 编辑关卡成功的打印 ${res}`);
+          .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             state.addLoading = false;
             closeDrawer();
           })
-          .catch((err) => {
+          .catch(() => {
             message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-            console.log(` 编辑关卡失败的打印 ${err}`);
           });
       } else if (props.isLevel == 2) {
         let editObj = {
@@ -730,7 +722,6 @@ export default {
       }
     };
     const changeOuter = (value) => {
-      console.log(value);
       state.isOuter = value;
     };
     const chooseTest = (index) => {
diff --git a/src/components/drawers/AddVote1.vue b/src/components/drawers/AddVote1.vue
index ffdee490..7ad5cc8d 100644
--- a/src/components/drawers/AddVote1.vue
+++ b/src/components/drawers/AddVote1.vue
@@ -168,8 +168,7 @@ export default {
       localStorage.setItem("chapterId", props.isactive);
     };
 
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
     };
 
     const showDrawer = () => {
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index cc4304de..109f2c2f 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -166,20 +166,15 @@ export default {
       });
     }; 
     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 = () => {
@@ -202,8 +197,7 @@ export default {
       ],
       ctx.emit("update:crevoteVisible", false);
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
       if (props.ballotId != 0) {
         queryStemText()
       }
@@ -237,14 +231,6 @@ export default {
           }
         }
       }
-      // 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]);
-      //     console.log(' state.questions[i].inputV', state.questions[i].inputV,);
-      //     console.log('state.questions[i].options[k].opvalue',state.questions[i].options[k].opvalue)
-      //   }
-      // }
       let obj = {
         "ballotId": 0,
         "ballotName": state.inputV1,
@@ -286,10 +272,6 @@ export default {
       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 = {
             ballotName: state.inputV1,
@@ -301,8 +283,8 @@ export default {
           ctx.emit("getData", objstem);
           closeDrawer();
         })
-        .catch((err) => {
-          console.log(err);
+        .catch(() => {
+          message.error("创建失败");
         });
     };
     //删除选项信息
@@ -312,11 +294,11 @@ export default {
       }
       api
         .deleteVoteStemOption(objdelopt)
-        .then((res) => {
-          console.log('删除选项信息成功', res);
+        .then(() => {
+          message.success("删除成功");
         })
-        .catch((err) => {
-          console.log('删除选项信息失败', err);
+        .catch(() => {
+          message.error("创建失败");
         });
     }
     //根据id获取题干信息
@@ -324,13 +306,9 @@ export default {
       api
         .queryStemByStemId({ballotId:props.ballotId})
         .then((res) => {
-       
- 
-          console.log('获取题干信息成功', res);
           state.inputV1 = res.data.data.voteName
         })
-        .catch((err) => {
-          console.log('获取题干信息失败', err);
+        .catch(() => {
         })
     }
     //编辑题干信息
@@ -372,11 +350,11 @@ export default {
         ]
       }
       api.updateStemMessage(objcst)
-        .then((res) => {
-          console.log('修改题干信息成功', res);
+        .then(() => {
+          message.success("修改题干信息成功")
         })
-        .catch((err) => {
-          console.log('修改题干信息失败', err);
+        .catch(() => {
+          message.error("修改题干信息失败")
         })
     }
     return {
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index ed6c398f..86be21ed 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -220,14 +220,12 @@ export default {
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+    const afterVisibleChange = () => {
         queryVoteInfo();
     };
     const showDrawerCreVote = () => {
       state.createVoteVisible = true;
       state.editChild = props.edit;
-      console.log("=======前")
 
     };
     const getStemId = (data) => {
@@ -245,8 +243,7 @@ export default {
         voteStemId:state.voteStemId
       }
       api.deleteVoteStem(objdelstem)
-        .then((res) => {
-          console.log('删除题干信息成功', res)
+        .then(() => {
           message.success('删除题干信息成功')
           delBox()
       })
@@ -284,14 +281,13 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 12,
         })
-          .then((res) => {
-            console.log(res, 11111);
+          .then(() => {
             message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
             ctx.emit("changeData", false);
             state.addLoading = false;               
           })
-          .catch((err) => {
-            console.log(err, 1111);
+          .catch(( ) => {
+            message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
           });
       }else if(props.isLevel ==2){
         apiTask
@@ -303,12 +299,12 @@ export default {
             stageId: props.chooseStageId,
             type: 12,
           })
-          .then((res) => {
-            console.log("调用项目添加接口后111", res.data, 11111);
+          .then(() => {
+            message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
             ctx.emit("changeData", false);   
           })
-          .catch((err) => {
-            console.log(err, 111111);
+          .catch(() => {
+            message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
           });
       }else if(props.isLevel ==3){
         console.log("");
@@ -347,10 +343,10 @@ export default {
         .then((res) => {
           updateToTask(res);
           closeDrawer();
-          console.log('修改投票信息成功', res);
+          message.success("修改投票信息成功")
         })
-        .catch((err) => {
-          console.log('修改投票信息失败', err);
+        .catch(() => {
+          message.error("修改投票信息失败")
         })
       }else{
         api
@@ -358,10 +354,10 @@ export default {
         .then((res) => {
           updateToTask(res);
           closeDrawer();
-          console.log('创建投票信息成功', res);
+          message.success("创建投票信息成功")
         })
-        .catch((err) => {
-          console.log('创建投票信息失败', err);
+        .catch(() => {
+          message.error("创建投票信息失败")
         })
       }
       
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 16563461..4f7d1646 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -102,14 +102,11 @@ export default {
       allFormsData: [],
 
     });
-    const afterVisibleChange = (bool) => {
-      console.log("state======进来creates", bool);
+    const afterVisibleChange = () => {
       handleTypes();
     };
     const closeDrawer = () => {
       ctx.emit("update:createVoteVisible", false);
-
-      console.log("======关闭");
     }
     // 详情
     const getInfoDate = async () => {
@@ -129,8 +126,6 @@ export default {
         ];
         // sortBy(renderArr, "orderNumber"); //序号
         state.allFormsData = parseData(renderArr); //类型
-        // console.log("state.allFormsData");
-        // console.log(state.allFormsData);
       }
     };
     getInfoDate();
@@ -306,10 +301,9 @@ export default {
         ],
       };
       state.allFormsData.push(obj);
-      console.log("state.allFormsData=====", state.allFormsData, state.allFormsData.length);
     };
 
-    const handleDel = ({ id, curItem }) => {
+    const handleDel = ({ id }) => {
       state.allFormsData.forEach((item, index) => {
         if (item.id === id) {
           state.allFormsData.splice(index, 1);
@@ -319,7 +313,6 @@ export default {
         item.id = index + 1;
         return item;
       });
-      console.log("curItem.orderNumber", curItem.orderNumber);
 
       // orderNumber: curItem.orderNumber,
     };
diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue
index d63e2b07..dbbd87df 100644
--- a/src/components/vote/VoteQuestion.vue
+++ b/src/components/vote/VoteQuestion.vue
@@ -107,12 +107,11 @@ export default {
         }
       });
     };
-    const del = ({ id, optionId }) => {
+    const del = ({ id }) => {
       curItem.value.singleList.forEach((item, index) => {
         if (item.id === id) {
           curItem.value.singleList.splice(index, 1);
         }
-        console.log("删除=====",id,optionId);
       });
 
       
diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
index 97776f69..a99eda58 100644
--- a/src/components/vote/VoteQuestionItem.vue
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -99,7 +99,6 @@ export default {
 
       const formData = new FormData();
       formData.append("file", file);
-      console.log(file);
       fileUp(formData).then((res) => {
         if (res.data.code === 200) {
           state.hasImgName = file.name;
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index b363e8c2..0257f6f5 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1177,7 +1177,6 @@ export default {
     WorkManage,
     SeeStu
   },
-  methods: {},
   setup() {
     // const routers = useRoute();
     // const store = useStore();
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index cdbc627e..d6f19c2c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -658,9 +658,14 @@
                       onChange: onSelectChange,
                     }"
                   />
+                  <!-- 列表无数据样式
                   <div
                     class="nostu"
                     :style="{ display: total > 0 ? 'none' : 'block' }"
+                  >                   -->
+                  <div
+                    class="nostu"
+                    style="display:none"
                   >
                     <div class="nostuimg"></div>
                   </div>

From 52e1e7c83d1650cce2cb88eec90275f379d283d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Fri, 18 Nov 2022 09:36:44 +0800
Subject: [PATCH 67/90] =?UTF-8?q?feat=EF=BC=9A=E6=8D=A2=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexProjStu.js                |   5 +-
 src/components/drawers/ChangeGroup.vue |  82 +++-
 src/views/projectcenter/TaskPage.vue   | 496 +++++++++++++++----------
 3 files changed, 372 insertions(+), 211 deletions(-)

diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 7d41cb19..050d59ba 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -28,4 +28,7 @@ export const overview = (obj) => http.get('/admin/project/overview', { params: o
 export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
 
 //获取学员积分明细列表
-export const studentScoreList = (obj) => http.post('/admin/project/studentScoreList', obj)
\ No newline at end of file
+export const studentScoreList = (obj) => http.post('/admin/project/studentScoreList', obj)
+
+//添加项目学员
+export const addStudent = (obj) => http.post('/admin/project/addStudent', obj)
\ No newline at end of file
diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 2059425d..3f83f850 100644
--- a/src/components/drawers/ChangeGroup.vue
+++ b/src/components/drawers/ChangeGroup.vue
@@ -29,8 +29,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="changeGroup">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -38,7 +38,9 @@
 
 <script>
 import { reactive, toRefs } from "vue";
-import { getGroupList } from "../../api/indexProjStu";
+import { getGroupList, addStudent } from "../../api/indexProjStu";
+import { message } from "ant-design-vue";
+
 export default {
   name: "ChangeGroup",
   props: {
@@ -50,6 +52,18 @@ export default {
       type: Number,
       default: null,
     },
+    ChangeGroupStuId: {
+      type: Number,
+      default: null,
+    },
+    ChangeGroupStuName: {
+      type: String,
+      default: null,
+    },
+    ChangeGroupId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -59,21 +73,13 @@ export default {
         //   value: "好好学习",
         //   label: "好好学习",
         // },
-        // {
-        //   id: "2",
-        //   value: "天天向上",
-        //   label: "天天向上",
-        // },
-        // {
-        //   id: "3",
-        //   value: "最强小组",
-        //   label: "最强小组",
-        // },
       ],
       groupValue: null, //下拉框选择的值
+      chooseGroupId: null, //下拉框选择的小组id
     });
     const closeDrawer = () => {
       ctx.emit("update:Changevisible", false);
+      state.groupValue = null;
     };
     const setStuGroups = (tableData) => {
       let data = tableData;
@@ -106,16 +112,62 @@ export default {
         }
       });
     };
-    const handleChange = (value) => {
+    const handleChange = (value, item) => {
       console.log(`selected ${value}`);
+      console.log(item);
+      state.chooseGroupId = item.id;
+    };
+    const changeGroup = () => {
+      // closeDrawer()
+      if (state.chooseGroupId) {
+        if (props.ChangeGroupId == state.chooseGroupId) {
+          message.destroy();
+          return message.warning("学员已在该小组");
+        } else {
+          let obj = {
+            deptList: [
+              {
+                id: 0,
+                name: "",
+              },
+            ],
+            groupList: [
+              {
+                id: 0,
+                name: "",
+              },
+            ],
+            projectGroupId: state.chooseGroupId,
+            projectId: props.projectId,
+            studentList: [
+              {
+                id: props.ChangeGroupStuId,
+                name: props.ChangeGroupStuName,
+              },
+            ],
+          };
+          addStudent(obj)
+            .then((res) => {
+              message.destroy();
+              console.log(res, "换组成功");
+              ctx.emit("changeD", false);
+              closeDrawer();
+              return message.success("换组成功");
+            })
+            .catch((err) => {
+              console.log(err, "换组失败");
+              message.warning("换组失败");
+            });
+        }
+      }
     };
-
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       setStuGroups,
       handleChange,
+      changeGroup,
       // change,
     };
   },
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4658e853..5342027c 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -477,7 +477,7 @@
                         style="cursor: pointer"
                         @click="showCodeModal"
                       >
-                      <!-- 我的@click=" showCopyModal(item.type)" -->
+                        <!-- 我的@click=" showCopyModal(item.type)" -->
                         二维码
                       </div>
                       <div
@@ -494,9 +494,9 @@
                             : item.type == '5' || item.type == '10'
                             ? showTest(item.name, item.projectTaskId)
                             : item.type == '2' || item.type == '6'
-                            ? showFace(item.name,item.projectTaskId)
+                            ? showFace(item.name, item.projectTaskId)
                             : item.type == '4'
-                            ? showWork(item.name,item.projectTaskId)
+                            ? showWork(item.name, item.projectTaskId)
                             : null
                         "
                       >
@@ -1104,6 +1104,10 @@
     <change-group
       v-model:Changevisible="Changevisible"
       v-model:projectId="projectId"
+      v-model:ChangeGroupStuId="ChangeGroupStuId"
+      v-model:ChangeGroupStuName="ChangeGroupStuName"
+      v-model:ChangeGroupId = "ChangeGroupId"
+      @changeD="changeGrouped"
     />
     <!-- 组员名单抽屉 -->
     <member-list
@@ -1123,33 +1127,60 @@
       :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
-    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" />
+    <test-manage
+      v-model:TMvisible.sync="TMvisible"
+      v-if="TMvisible"
+      :title="showTestText"
+      :projectTaskId="projectTaskId"
+    />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
-    
+
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
-      <a-modal v-model:visible="pubproject" :title="null" @ok="closeModal" :footer="null" :closable="false" :centered="true"
-        wrapClassName="pubproject" width="679px" height="437px">
-        <div class="modalHeader" style="
-          width: 100%;
-          height: 68px;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-        ">
+      <a-modal
+        v-model:visible="pubproject"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        :centered="true"
+        wrapClassName="pubproject"
+        width="679px"
+        height="437px"
+      >
+        <div
+          class="modalHeader"
+          style="
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
           <div class="headerLeft" style="margin-left: 32px">
-            <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
-            <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">项目发布</span>
+            <span style="width: 15px; height: 15px"
+              ><img src="../../assets/images/taskpage/pub.png"
+            /></span>
+            <span
+              class="headerLeftText"
+              style="font-size: 16px; margin-left: 10px"
+              >项目发布</span
+            >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-            <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
           </div>
         </div>
         <div class="modalMain">
           <div class="projectname">管理者进阶-腾飞班1</div>
           <div class="projecttime">
-            <span class="timeti">项目时间：</span><span class="timeme">2022/08/01-2022/08/30</span>
+            <span class="timeti">项目时间：</span
+            ><span class="timeme">2022/08/01-2022/08/30</span>
           </div>
           <div class="projectbox">
             <div class="promessage">
@@ -1166,8 +1197,12 @@
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
-            <a-checkbox v-model:checked="checked1"><span class="sendpeo">发给老师</span></a-checkbox>
-            <a-checkbox v-model:checked="checked2"><span class="sendpeo">发给学员</span></a-checkbox>
+            <a-checkbox v-model:checked="checked1"
+              ><span class="sendpeo">发给老师</span></a-checkbox
+            >
+            <a-checkbox v-model:checked="checked2"
+              ><span class="sendpeo">发给学员</span></a-checkbox
+            >
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal">取消</a-button>
@@ -1175,181 +1210,239 @@
           </div>
         </div>
       </a-modal>
-      </div>
-      <!-- 概览（无数据）-项目发布弹窗 -->
-      <!-- 学员-创建小组弹窗 -->
-      <div>
-        <a-modal v-model:visible="stugroup" :title="null" @ok="closeModal2" :footer="null" :closable="false" :centered="true"
-          wrapClassName="doublepro" width="624px" height="332px">
-          <div class="modalHeader" style="
+    </div>
+    <!-- 概览（无数据）-项目发布弹窗 -->
+    <!-- 学员-创建小组弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="stugroup"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        :centered="true"
+        wrapClassName="doublepro"
+        width="624px"
+        height="332px"
+      >
+        <div
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-          ">
-            <div class="headerLeft" style="margin-left: 32px">
-              <span class="headerLeftText" style="font-size: 16px">创建小组</span>
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px">创建小组</span>
+          </div>
+          <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
             </div>
-            <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-              <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
+            <div class="inname">小组名称:</div>
+            <div class="in">
+              <a-input
+                v-model:value="valueaddg"
+                placeholder="请输入小组名称"
+                style="border-radius: 8px; height: 40px"
+              />
             </div>
           </div>
-          <div class="modalMain">
-            <div class="name">
-              <div class="star" style="margin-top: -4px">
-                <img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-              </div>
-              <div class="inname">小组名称:</div>
-              <div class="in">
-                <a-input v-model:value="valueaddg" placeholder="请输入小组名称" style="border-radius: 8px; height: 40px" />
-              </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px; margin-left: 15px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
             </div>
-            <div class="name">
-              <div class="star" style="margin-top: -4px">
-                <img style="width: 10px; height: 10px; margin-left: 15px" src="../../assets/images/basicinfo/asterisk.png" />
-              </div>
-              <div class="inname">小组长:</div>
-              <div class="in">
-                <a-input v-model:value="valueaddm" placeholder="请输入小组长" style="border-radius: 8px; height: 40px" />
-              </div>
-            </div>
-            <div class="pubtn">
-              <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-              <a-button class="pubtn2" @click="createG">确定</a-button>
+            <div class="inname">小组长:</div>
+            <div class="in">
+              <a-input
+                v-model:value="valueaddm"
+                placeholder="请输入小组长"
+                style="border-radius: 8px; height: 40px"
+              />
             </div>
           </div>
-        </a-modal>
-      </div>
-      <!-- 学员-创建小组弹窗 -->
-      <!-- 取消学员弹窗 -->
-      <div>
-        <a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
-          @cancel="closeModal1">
-          <div class="delete">
-            <div class="del_header"></div>
-            <div class="del_main">
-              <div class="header">
-                <div class="icon1"></div>
-                <span>提示</span>
-              </div>
-              <div class="body">
-                <span>您是否授予此学员优秀学员称号？</span>
-              </div>
-              <div class="del_btnbox">
-                <div class="del_btn btn1">
-                  <div class="btnText" @click="cancelyou">取消</div>
-                </div>
-                <div class="del_btn btn2">
-                  <div class="btnText" @click="closeModal1">确定</div>
-                </div>
-              </div>
-            </div>
+          <div class="pubtn">
+            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="createG">确定</a-button>
           </div>
-        </a-modal>
-      </div>
-      <!-- 取消学员弹窗 -->
-      <!-- 优秀学员弹窗 -->
-      <div>
-        <a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-          <div class="delete">
-            <div class="del_header"></div>
-            <div class="del_main">
-              <div class="header">
-                <div class="icon1"></div>
-                <span>提示</span>
-              </div>
-              <div class="body">
-                <span>您是否取消此学员优学员称号？</span>
-              </div>
-              <div class="del_btnbox">
-                <div class="del_btn btn1">
-                  <div class="btnText" @click="cancelcanyou">取消</div>
-                </div>
-                <div class="del_btn btn2">
-                  <div class="btnText" @click="closeModal3">确定</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </a-modal>
-      </div>
-      <!-- 取消学员弹窗 -->
-      <!-- 删除学员弹窗 -->
-      <div>
-        <a-modal v-model:visible="deleteOneStu" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-          <div class="delete">
-            <div class="del_header"></div>
-            <div class="del_main">
-              <div class="header">
-                <div class="icon1"></div>
-                <span>提示</span>
-              </div>
-              <div class="body">
-                <span>您确定要删除此学员吗</span>
-              </div>
-              <div class="del_btnbox">
-                <div class="del_btn btn1">
-                  <div class="btnText" @click="closeDeleteOne">取消</div>
-                </div>
-                <div class="del_btn btn2">
-                  <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </a-modal>
-      </div>
-      <!-- 删除学员弹窗 -->
-      
-      <!-- 删除弹窗 -->
-      <div>
-        <a-modal v-model:visible="delete_hs" :footer="null" :closable="closableQR" wrapClassName="DelModal"
-          style="margin-top: 400px" @cancel="delete_exit">
-          <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
-            <div class="del_header"></div>
-            <div class="del_main">
-              <div class="header">
-                <div class="del-icon"></div>
-                <span>提示</span>
-                <div class="close_exit" @click="delete_exit"></div>
-              </div>
-              <div class="body">
-                <span>您确定要删除此课程吗</span>
-              </div>
-              <div class="del_btnbox">
-                <div class="del_btn btn1">
-                  <div class="btnText" @click="delete_exit">取消</div>
-                </div>
-                <div class="del_btn btn2">
-                  <div class="btnText" @click="delete_exit">确定</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </a-modal>
-      </div>
-      <!-- 删除弹窗 -->
-      <!-- 管理二维码 -->
-      <a-modal v-model:visible="copyModal" :footer="null" :closable="closeCopy" wrapClassName="facemanageModal"
-        centered="true">
+        </div>
+      </a-modal>
+    </div>
+    <!-- 学员-创建小组弹窗 -->
+    <!-- 取消学员弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="canclestu"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu"
+        centered="true"
+        @cancel="closeModal1"
+      >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
             <div class="header">
-              <div class="icon"></div>
-              <span v-if="QRtype == '1'">在线管理</span>
-              <span v-if="QRtype == '2'">面授管理</span>
-              <span v-if="QRtype == '3'">案例管理</span>
-              <span v-if="QRtype == '4'">作业管理</span>
-              <span v-if="QRtype == '5'">考试管理</span>
-              <span v-if="QRtype == '6'">直播管理</span>
-              <span v-if="QRtype == '7'">外链管理</span>
-              <span v-if="QRtype == '8'">讨论管理</span>
-              <span v-if="QRtype == '9'">活动管理</span>
-              <span v-if="QRtype == '10'">测评管理</span>
-              <span v-if="QRtype == '11'">评估管理</span>
-              <span v-if="QRtype == '12'">投票管理</span>
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span>您是否授予此学员优秀学员称号？</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="cancelyou">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="closeModal1">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 取消学员弹窗 -->
+    <!-- 优秀学员弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="canclestu1"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span>您是否取消此学员优学员称号？</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="cancelcanyou">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="closeModal3">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 取消学员弹窗 -->
+    <!-- 删除学员弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="deleteOneStu"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
+        <div class="delete">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="icon1"></div>
+              <span>提示</span>
+            </div>
+            <div class="body">
+              <span>您确定要删除此学员吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="closeDeleteOne">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 删除学员弹窗 -->
+
+    <!-- 删除弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="delete_hs"
+        :footer="null"
+        :closable="closableQR"
+        wrapClassName="DelModal"
+        style="margin-top: 400px"
+        @cancel="delete_exit"
+      >
+        <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
+          <div class="del_header"></div>
+          <div class="del_main">
+            <div class="header">
+              <div class="del-icon"></div>
+              <span>提示</span>
+              <div class="close_exit" @click="delete_exit"></div>
+            </div>
+            <div class="body">
+              <span>您确定要删除此课程吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="delete_exit">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="delete_exit">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 删除弹窗 -->
+    <!-- 管理二维码 -->
+    <a-modal
+      v-model:visible="copyModal"
+      :footer="null"
+      :closable="closeCopy"
+      wrapClassName="facemanageModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span v-if="QRtype == '1'">在线管理</span>
+            <span v-if="QRtype == '2'">面授管理</span>
+            <span v-if="QRtype == '3'">案例管理</span>
+            <span v-if="QRtype == '4'">作业管理</span>
+            <span v-if="QRtype == '5'">考试管理</span>
+            <span v-if="QRtype == '6'">直播管理</span>
+            <span v-if="QRtype == '7'">外链管理</span>
+            <span v-if="QRtype == '8'">讨论管理</span>
+            <span v-if="QRtype == '9'">活动管理</span>
+            <span v-if="QRtype == '10'">测评管理</span>
+            <span v-if="QRtype == '11'">评估管理</span>
+            <span v-if="QRtype == '12'">投票管理</span>
             <div class="close_exit" @click="closeCopyModal"></div>
           </div>
           <div class="body">
@@ -1806,6 +1899,9 @@ export default {
       closeStop: false,
       startModal: false,
       closeStart: false,
+      ChangeGroupStuId: null, //要换组的学生id
+      ChangeGroupStuName: null, //要换组的学生name
+      ChangeGroupId: null, //要换组的学生的小组id
       //进度排行表
       jindutabledata: [
         {
@@ -2256,13 +2352,12 @@ export default {
       //考试、测评页面传递参数title
       showTestText: "",
       //直播、面授传递title
-      showFaceText:"",
+      showFaceText: "",
       //直播、面授传递title
-      showWorkText:"",
+      showWorkText: "",
       //直播、活动页面传递参数
       showkaoqinText: "",
 
-
       //排行榜时间
       rankStartTime: null,
       rankEndTime: null,
@@ -2521,29 +2616,29 @@ export default {
     const showCopyModal = (itemtype) => {
       state.copyModal = true;
       if (itemtype == "1") {
-        state.QRtype = "1"
+        state.QRtype = "1";
       } else if (itemtype == "2") {
-        state.QRtype = "2"
+        state.QRtype = "2";
       } else if (itemtype == "3") {
-        state.QRtype = "3"
+        state.QRtype = "3";
       } else if (itemtype == "4") {
-        state.QRtype = "4"
+        state.QRtype = "4";
       } else if (itemtype == "5") {
-        state.QRtype = "5"
+        state.QRtype = "5";
       } else if (itemtype == "6") {
-        state.QRtype = "6"
+        state.QRtype = "6";
       } else if (itemtype == "7") {
-        state.QRtype = "7"
+        state.QRtype = "7";
       } else if (itemtype == "8") {
-        state.QRtype = "8"
+        state.QRtype = "8";
       } else if (itemtype == "9") {
-        state.QRtype = "9"
+        state.QRtype = "9";
       } else if (itemtype == "10") {
-        state.QRtype = "10"
+        state.QRtype = "10";
       } else if (itemtype == "11") {
-        state.QRtype = "11"
+        state.QRtype = "11";
       } else if (itemtype == "12") {
-        state.QRtype = "12"
+        state.QRtype = "12";
       }
     };
     const closeCopyModal = () => {
@@ -2587,7 +2682,7 @@ export default {
       state.showkaoqinText = "【" + course + "】" + "考勤";
     };
     //作业管理的抽屉
-    const showWork = (name,id) => {
+    const showWork = (name, id) => {
       state.Wvisible = true;
       state.showWorkText = name;
       state.projectTaskId = id;
@@ -2703,8 +2798,13 @@ export default {
               >
                 <a-select-option value="换组" label="换组">
                   <div
+                    style="cursor:pointer"
                     onClick={() => {
                       state.Changevisible = true;
+                      console.log(value, "xixixixix");
+                      state.ChangeGroupStuId = value.studentId;
+                      state.ChangeGroupStuName = value.name;
+                      state.ChangeGroupId = value.groupId;
                     }}
                   >
                     换组
@@ -2712,6 +2812,7 @@ export default {
                 </a-select-option>
                 <a-select-option value="删除" label="删除">
                   <div
+                    style="cursor:pointer"
                     onClick={() => {
                       console.log("点击了111", value.studentId);
                       showDeleteOne(value.studentId);
@@ -3225,6 +3326,10 @@ export default {
       state.currentPageStu = page;
       getStu();
     };
+    const changeGrouped = (data) => {
+      console.log(data);
+      getStu();
+    };
     //end---------学员------
 
     //start---------项目概览
@@ -3545,6 +3650,7 @@ export default {
       showStartModal,
       closeStartModal,
       templateProject,
+      changeGrouped,
     };
   },
 };

From 0680168b75c69946d43b1e4b51281c99bef391f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Fri, 18 Nov 2022 10:08:44 +0800
Subject: [PATCH 68/90] =?UTF-8?q?fix:=E6=8D=A2=E7=BB=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ChangeGroup.vue |   6 +-
 src/views/projectcenter/TaskPage.vue   | 313 +++++++++++++------------
 2 files changed, 165 insertions(+), 154 deletions(-)

diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 3f83f850..9c952210 100644
--- a/src/components/drawers/ChangeGroup.vue
+++ b/src/components/drawers/ChangeGroup.vue
@@ -119,7 +119,11 @@ export default {
     };
     const changeGroup = () => {
       // closeDrawer()
-      if (state.chooseGroupId) {
+      console.log("state.chooseGroupId", state.chooseGroupId);
+      console.log("props.projectId", props.projectId);
+      console.log("props.ChangeGroupStuId", props.ChangeGroupStuId);
+      console.log("props.ChangeGroupStuName", props.ChangeGroupStuName);
+      if (state.chooseGroupId !== null) {
         if (props.ChangeGroupId == state.chooseGroupId) {
           message.destroy();
           return message.warning("学员已在该小组");
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index eeb71b26..2859cfaa 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -462,7 +462,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA(item.name,)"
+                        @click="showAA(item.name)"
                         :style="{
                           display:
                             item.type == '6' || item.type == '9'
@@ -663,10 +663,7 @@
                     class="nostu"
                     :style="{ display: total > 0 ? 'none' : 'block' }"
                   >                   -->
-                  <div
-                    class="nostu"
-                    style="display:none"
-                  >
+                  <div class="nostu" style="display: none">
                     <div class="nostuimg"></div>
                   </div>
                   <div class="pa">
@@ -1113,7 +1110,7 @@
       v-model:projectId="projectId"
       v-model:ChangeGroupStuId="ChangeGroupStuId"
       v-model:ChangeGroupStuName="ChangeGroupStuName"
-      v-model:ChangeGroupId = "ChangeGroupId"
+      v-model:ChangeGroupId="ChangeGroupId"
       @changeD="changeGrouped"
     />
     <!-- 组员名单抽屉 -->
@@ -1134,7 +1131,13 @@
       :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
-    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" :itemsType="itemstype"/>
+    <test-manage
+      v-model:TMvisible.sync="TMvisible"
+      v-if="TMvisible"
+      :title="showTestText"
+      :projectTaskId="projectTaskId"
+      :itemsType="itemstype"
+    />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
@@ -2360,7 +2363,7 @@ export default {
       //直播、活动页面传递参数
       showkaoqinText: "",
       //所有抽屉的传过去的type
-      itemstype:null,
+      itemstype: null,
 
       //排行榜时间
       rankStartTime: null,
@@ -2756,91 +2759,91 @@ export default {
     };
 
     //学员管理列表操作
-    const studentData = () => {
-      let arr = state.tabledata;
-      console.log(arr, "学员管理");
-      arr.map((value) => {
-        value.operation = (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
-            <div
-              class="studentopea1"
-              onClick={() => {
-                if (value.excellent === false) {
-                  state.canclestu = true;
-                  console.log("youxiu", value.studentId);
-                  state.changeGoods.push(value.studentId);
-                } else if (value.excellent === true) {
-                  state.canclestu1 = true;
-                  console.log("youxiu", value.studentId);
-                  state.changeGoods.push(value.studentId);
-                }
-              }}
-            >
-              {value.excellent ? "取消优秀" : "优秀学员"}
-            </div>
-
-            <div
-              class="studentopea2"
-              onClick={() => {
-                state.Seevisible = true;
-                console.log(value.studentId, "点击了查看");
-                state.checkStuId = value.studentId;
-              }}
-            >
-              查看
-            </div>
-            <div class="studentSelect">
-              <a-select
-                style="width: 50px"
-                value="更多"
-                // options={state.projectNameList}
-                dropdownClassName="tabledropdown"
-              >
-                <a-select-option value="换组" label="换组">
-                  <div
-                    style="cursor:pointer"
-                    onClick={() => {
-                      state.Changevisible = true;
-                      console.log(value, "xixixixix");
-                      state.ChangeGroupStuId = value.studentId;
-                      state.ChangeGroupStuName = value.name;
-                      state.ChangeGroupId = value.groupId;
-                    }}
-                  >
-                    换组
-                  </div>
-                </a-select-option>
-                <a-select-option value="删除" label="删除">
-                  <div
-                    style="cursor:pointer"
-                    onClick={() => {
-                      console.log("点击了111", value.studentId);
-                      showDeleteOne(value.studentId);
-                    }}
-                  >
-                    删除
-                  </div>
-                </a-select-option>
-              </a-select>
-            </div>
-          </div>
-        );
-      });
-      state.tabledata = arr;
-    };
-    studentData();
     // const studentData = () => {
     //   let arr = state.tabledata;
     //   console.log(arr, "学员管理");
     //   arr.map((value) => {
     //     value.operation = (
-       
+    //       <div
+    //         style={{
+    //           display: "flex",
+    //           alignItems: "center",
+    //           justifyContent: "center",
+    //         }}
+    //       >
+    //         <div
+    //           class="studentopea1"
+    //           onClick={() => {
+    //             if (value.excellent === false) {
+    //               state.canclestu = true;
+    //               console.log("youxiu", value.studentId);
+    //               state.changeGoods.push(value.studentId);
+    //             } else if (value.excellent === true) {
+    //               state.canclestu1 = true;
+    //               console.log("youxiu", value.studentId);
+    //               state.changeGoods.push(value.studentId);
+    //             }
+    //           }}
+    //         >
+    //           {value.excellent ? "取消优秀" : "优秀学员"}
+    //         </div>
+
+    //         <div
+    //           class="studentopea2"
+    //           onClick={() => {
+    //             state.Seevisible = true;
+    //             console.log(value.studentId, "点击了查看");
+    //             state.checkStuId = value.studentId;
+    //           }}
+    //         >
+    //           查看
+    //         </div>
+    //         <div class="studentSelect">
+    //           <a-select
+    //             style="width: 50px"
+    //             value="更多"
+    //             // options={state.projectNameList}
+    //             dropdownClassName="tabledropdown"
+    //           >
+    //             <a-select-option value="换组" label="换组">
+    //               <div
+    //                 style="cursor:pointer"
+    //                 onClick={() => {
+    //                   state.Changevisible = true;
+    //                   console.log(value, "xixixixix");
+    //                   state.ChangeGroupStuId = value.studentId;
+    //                   state.ChangeGroupStuName = value.name;
+    //                   state.ChangeGroupId = value.groupId;
+    //                 }}
+    //               >
+    //                 换组
+    //               </div>
+    //             </a-select-option>
+    //             <a-select-option value="删除" label="删除">
+    //               <div
+    //                 style="cursor:pointer"
+    //                 onClick={() => {
+    //                   console.log("点击了111", value.studentId);
+    //                   showDeleteOne(value.studentId);
+    //                 }}
+    //               >
+    //                 删除
+    //               </div>
+    //             </a-select-option>
+    //           </a-select>
+    //         </div>
+    //       </div>
+    //     );
+    //   });
+    //   state.tabledata = arr;
+    // };
+    // studentData();
+    // const studentData = () => {
+    //   let arr = state.tabledata;
+    //   console.log(arr, "学员管理");
+    //   arr.map((value) => {
+    //     value.operation = (
+
     //     );
     //   });
     //   state.tabledata = arr;
@@ -2952,75 +2955,79 @@ export default {
           // width: 60,
           align: "center",
           className: "h",
-           scopedSlots: { customRender: "action" }, //引入的插槽
-             customRender: (text) => {
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
             // console.log(text);
             return (
-                 <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
-            <div
-              class="studentopea1"
-              onClick={() => {
-                if (text.record.excellent === false) {
-                  state.canclestu = true;
-                  console.log("youxiu", text.record.studentId);
-                  state.changeGoods.push(text.record.studentId);
-                } else if (text.record.excellent === true) {
-                  state.canclestu1 = true;
-                  console.log("youxiu", text.record.studentId);
-                  state.changeGoods.push(text.record.studentId);
-                }
-              }}
-            >
-              {text.record.excellent ? "取消优秀" : "优秀学员"}
-            </div>
-
-            <div
-              class="studentopea2"
-              onClick={() => {
-                state.Seevisible = true;
-                console.log(text.record.studentId, "点击了查看");
-                state.checkStuId = text.record.studentId;
-              }}
-            >
-              查看
-            </div>
-              <div class="studentSelect">
-              <a-select
-                style="width: 50px"
-                value="更多"
-                // options={state.projectNameList}
-                dropdownClassName="tabledropdown"
+              <div
+                style={{
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                }}
               >
-                <a-select-option value="换组" label="换组">
-                  <div
-                    onClick={() => {
-                      state.Changevisible = true;
-                    }}
+                <div
+                  class="studentopea1"
+                  onClick={() => {
+                    if (text.record.excellent === false) {
+                      state.canclestu = true;
+                      console.log("youxiu", text.record.studentId);
+                      state.changeGoods.push(text.record.studentId);
+                    } else if (text.record.excellent === true) {
+                      state.canclestu1 = true;
+                      console.log("youxiu", text.record.studentId);
+                      state.changeGoods.push(text.record.studentId);
+                    }
+                  }}
+                >
+                  {text.record.excellent ? "取消优秀" : "优秀学员"}
+                </div>
+
+                <div
+                  class="studentopea2"
+                  onClick={() => {
+                    state.Seevisible = true;
+                    console.log(text.record.studentId, "点击了查看");
+                    state.checkStuId = text.record.studentId;
+                  }}
+                >
+                  查看
+                </div>
+                <div class="studentSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
                   >
-                    换组
-                  </div>
-                </a-select-option>
-                <a-select-option value="删除" label="删除">
-                  <div
-                    onClick={() => {
-                      // console.log("点击了111", text);
-                      showDeleteOne(text.record.studentId);
-                    }}
-                  >
-                    删除
-                  </div>
-                </a-select-option>
-              </a-select>
-            </div>
-          </div>
-           
-              )}
+                    <a-select-option value="换组" label="换组">
+                      <div
+                        onClick={() => {
+                          state.Changevisible = true;
+                          console.log(text, "xixixixix");
+                          state.ChangeGroupStuId = text.record.studentId;
+                          state.ChangeGroupStuName = text.record.name;
+                          state.ChangeGroupId = text.record.groupId;
+                        }}
+                      >
+                        换组
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          // console.log("点击了111", text);
+                          showDeleteOne(text.record.studentId);
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            );
+          },
         },
       ];
       return tablecolumns;

From 987d683e066463391df712592cfd944030b75127 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Fri, 18 Nov 2022 13:00:15 +0800
Subject: [PATCH 69/90] =?UTF-8?q?feat:=E6=A1=88=E4=BE=8B=E5=92=8C=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=84=E6=8E=A5=E5=8F=A3=EF=BC=88=E6=B5=8B=E8=AF=95=EF=BC=89?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=85=E9=83=A8=E8=80=83=E8=AF=95=E9=80=89?=
 =?UTF-8?q?=E5=88=99=E8=80=83=E5=8D=B7=E6=8A=BD=E5=B1=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexCase.js                  |   4 +
 src/api/indexEval.js                  |   4 +
 src/components/drawers/AddCase.vue    |  56 ++--
 src/components/drawers/AddEval.vue    |   8 +-
 src/components/drawers/AddTest.vue    |  16 +-
 src/components/drawers/EvList.vue     | 201 ++++--------
 src/components/drawers/SelectTest.vue | 438 ++++++++++++++++++++++++++
 7 files changed, 558 insertions(+), 169 deletions(-)
 create mode 100644 src/api/indexCase.js
 create mode 100644 src/components/drawers/SelectTest.vue

diff --git a/src/api/indexCase.js b/src/api/indexCase.js
new file mode 100644
index 00000000..3cde9d27
--- /dev/null
+++ b/src/api/indexCase.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+//获取案例信息
+export const queryCasesDetailList = (obj) => http.post(" /cases/queryCasesDetailList", obj);
\ No newline at end of file
diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index 692a416d..e7419800 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -66,6 +66,10 @@ export const queryEvaluationDetailById = (obj) =>
 export const updateEvaluation = (obj) =>
   http.post("/evaluation/updateEvaluation", obj);
 
+//测评列表查询接口
+  export const choiceEvaluation = (obj) =>
+  http.post("  /evaluation/choiceEvaluation", obj);
+
 // 测试方法
 // import * as api from '../../api/index'
 // api.getLearnPath({}).then(res => {
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 9c98a026..b6315aee 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -82,11 +82,11 @@
 </template>
 <script>
 import { reactive, toRefs, onMounted } from "vue";
-import * as api from "../../api/indexInvist.js";
+import * as api from "../../api/indexCase.js";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { RouterEditTask } from "@/api/indexTask";
-import dayjs from "dayjs";
+// import dayjs from "dayjs";
 
 export default {
   name: "AddCase",
@@ -137,15 +137,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      tableData: [
-        {
-          key: "1",
-          title:
-            "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
-          name: "李玉冰",
-          time: "2022-10-31  23:12:00",
-        },
-      ],
+      tableData: [],
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
@@ -166,17 +158,16 @@ export default {
       const columns = [
         {
           title: "案例标题",
-          dataIndex: "tit",
-          key: "tit",
+          dataIndex: "title",
+          key: "title",
           width: "400px",
           align: "center",
         },
         {
-          title: "作者",
-          dataIndex: "name",
-          // width: "30%",
-          key: "name",
-          width: "100px",
+          title: "作者名称",
+          dataIndex: "authorName",
+          key: "authorName",
+          width: "200px",
           align: "center",
           className: "classify",
         },
@@ -184,8 +175,9 @@ export default {
           title: "导入时间",
           dataIndex: "time",
           key: "time",
-          width: "200px",
+          width: "400px",
           align: "center",
+          className: "classify",
         },
       ];
       return columns;
@@ -207,11 +199,12 @@ export default {
       data.map((value, index) => {
         let obj = {
           key: index,
-          assessmentId: value.assessmentId,
-          num: value.essayQuestionVoList.length,
-          name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          authorId:value.authorId,
+          authorName:value.authorName,
+          companyId:value.companyId,
+          coverUrl:value.coverUrl,
+          caseid:value.caseid,
+          title:value.title,
         };
         array.push(obj);
       });
@@ -220,19 +213,22 @@ export default {
     //获取全部案例信息接口
     const getAllCaseText = () => {
       api
-        .queryAssessmentDetailList({
-          assessmentName: "",
-          pageNo: state.currentPage,
-          pageSize: state.pageSize,
+        .queryCasesDetailList({
+          "keyWord": "",
+          "orderAsc": true,
+          "orderField": "",
+          "pageIndex": 0,
+          "pageSize": 0,
+          "top": true
         })
         .then((res) => {
-          let arr = res.data.data.rows;
+          let arr = res.data.data;
           if (res.status === 200) {
             getTableDate(arr);
-            state.tableDataTotal = Number(res.data.data.total);
           }
         })
         .catch(() => {
+          console.log('---------------------获取全部案例信息接口失败-----------------------');
         });
     };
     const updateTask = () => {
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index cfae1b59..6f1fc0a5 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -58,6 +58,7 @@
                   v-model:EvalListVisible="EvalListVisible"
                   v-model:evaluationTypeId="evaluationTypeId"
                   v-model:evaluationTypeName="evaluationTypeName"
+                  @getEvLsitDate="checkFinish"
                 />
               </div>
             </div>
@@ -166,13 +167,17 @@ export default {
       inputV2: "",
       time: undefined,
       EvalId: null,
+      //子传回来的参数
       evaluationTypeId: null,
       evaluationTypeName: "",
       description: "",
       EvalListVisible: false,
       // addLoading:false,
     });
-
+    const checkFinish = (EvListDate)=> {
+      state.evaluationTypeId = EvListDate.Id
+      state.evaluationTypeName = EvListDate.Name
+    }
     const closeDrawer = () => {
       ctx.emit("update:addevalVisible", false);
       ctx.emit("update:edit", false);
@@ -293,6 +298,7 @@ export default {
     return {
       ...toRefs(state),
       afterVisibleChange,
+      checkFinish,
       closeDrawer,
       //增改
       createEvalText,
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 923d0c82..ffbbf830 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -92,6 +92,7 @@
                       style="width: 100px; margin-left: 35px"
                       class="outer"
                       @click.prevent
+                      @click="selectTest()"
                     >
                       选择试卷
                       <DownOutlined />
@@ -304,6 +305,8 @@
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
       <a-spin :spinning="addLoading" tip="添加中..." />
     </div>
+    <!-- 选择考试抽屉 -->
+    <s-test v-model:STvisible="STvisible"/>
   </a-drawer>
 </template>
 <script>
@@ -314,14 +317,16 @@ import {
   queryExaminationDetailById,
   updateExamination,
 } from "@/api/indexExam";
+import STest from "./SelectTest.vue"
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 
 import dayjs from "dayjs";
 
 export default {
   name: "AddTest",
-  // components: {
-  // },
+  components: {
+    STest,
+  },
   props: {
     addtestVisible: {
       type: Boolean,
@@ -399,6 +404,7 @@ export default {
     const state = reactive({
       addLoading: false,
       isOuter: 1, // 是否为外部考试
+      STvisible:false, //选择试卷抽屉
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -577,6 +583,11 @@ export default {
         queryTest();
       }
     };
+
+    const selectTest = ()=> {
+      state.STvisible = true
+    }
+
     const queryTest = () => {
       state.addLoading = true;
       queryExaminationDetailById({ examinationId: props.EditTestId })
@@ -741,6 +752,7 @@ export default {
       formState,
       afterVisibleChange,
       closeDrawer,
+      selectTest,
       cloradio1,
       cloradio2,
       cloradio3,
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index da3b6361..d0bd45ba 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -46,7 +46,7 @@
           <div class="main_table">
             <a-table
             style="border: 1px solid #f2f6fe"
-            :columns="tablecolumns"
+            :columns="columns"
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
@@ -81,7 +81,7 @@
     </a-drawer>
 </template>
 <script>
-  import { reactive, toRefs, ref } from "vue";
+  import { reactive, toRefs, ref,onMounted } from "vue";
   import * as api from "../../api/indexEval";
    export default {
     name: "EvList",
@@ -101,115 +101,27 @@
     },
     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,
+        tableDataTotal: 0,
         pageSize: 10,
         vlue1:"",
-        tabledata: [
-      ],
+        evaluationTypeId:null,
+        evaluationTypeName:"",
+        tableData: [],
       });
-      const options1 = ref([
-    {
-      value: "value1",
-      label: "请选择状态",
-    },
-  ]);
-    const columns1 = [
+    const columns = [
       {
         title: "课程编号",
         width: "20%",
-        dataIndex: "num",
-        key: "num",
+        dataIndex: "kid",
+        key: "kid",
         align: "center",
       },
       {
         title: "title",
         width: "20%",
-        dataIndex: "name",
-        key: "name",
+        dataIndex: "title",
+        key: "title",
         align: "center",
       },
       {
@@ -222,15 +134,15 @@
       {
         title: "状态",
         width: "13%",
-        dataIndex: "teacher",
-        key: "teacher",
+        dataIndex: "status",
+        key: "status",
         align: "center",
       },
       {
         title: "价格",
         width: "13%",
-        dataIndex: "creator",
-        key: "creator",
+        dataIndex: "price",
+        key: "price",
         align: "center",
       },
       {
@@ -242,60 +154,59 @@
       },
     ];
     const rowSelection = ref({
+      type: "radio",
       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);
+      onSelect: (selectedRows) => {
+        state.evaluationTypeName = selectedRows.title
+        state.evaluationTypeId = selectedRows.kid
       },
     });
     const closeDrawer = () => {
       ctx.emit("update:EvalListVisible", false);
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-      getEvalList();
+    const afterVisibleChange = () => {
+      // getEvalList();
     };
     const checkFinish =() =>{
-      ctx.emit("update:evaluationTypeId", state.evaluationTypeId);
-      ctx.emit("update:evaluationTypeName", state.evaluationTypeName);
+      let EvListDate = {
+        Id : state.evaluationTypeId,
+        Name : state.evaluationTypeName,
+      }
+      ctx.emit("getEvListDate", EvListDate);
       closeDrawer();
     }
     const changePagination = (page) => {
       state.currentPage = page;
-      getEvalList();
+      // 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,
-
+          status:value.status,
+          kid:value.quiz_kid,
+          title:value.title,
+          price:value.quiz_price,
+          // 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
@@ -312,12 +223,30 @@
         }
       });
     };
+
+    //获取测评列表
+    const getAllEvalText = ()=> {
+      let objael = {
+        "keyword": "",
+        "user_id": 0
+      }
+      api
+      .choiceEvaluation(objael)
+      .then((res) => {
+        state.tableData = res.data.data
+        getTableDataList()
+      })
+    }
+    onMounted(() => {
+      getAllEvalText ();
+    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      options1,
-      columns1,
+      getEvalList,
+      getTableDataList,
+      columns,
       rowSelection,
       checkFinish,
       changePagination,
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
new file mode 100644
index 00000000..86d50e8b
--- /dev/null
+++ b/src/components/drawers/SelectTest.vue
@@ -0,0 +1,438 @@
+<template>
+    <a-drawer
+      :visible="STvisible"
+      class="drawerStyle TimeManage"
+      placement="right"
+      width="60%"
+      @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="main">
+          <div class="search">
+            <div class="sealeft">
+              <div class="namecon" style="margin-right: 30px">
+                <div class="name">试卷名称：</div>
+                <a-input
+                  v-model:value="name"
+                  style="width: 270px; height: 40px; border-radius: 8px"
+                  placeholder="请输入试卷名称或序号"
+                />
+              </div>
+              <div class="namecon" style="margin-right: 30px">
+                <div class="name">创建人：</div>
+                <a-input
+                  v-model:value="name"
+                  style="width: 240px; height: 40px; border-radius: 8px"
+                  placeholder="请输入创建人"
+                />
+              </div>
+            </div>
+            <div class="btns">
+              <div
+                class="btn btn1"
+                style="margin-right: 20px"
+                @click="searchTaskList"
+              >
+                <div class="img1"></div>
+                <div class="wz">搜索</div>
+              </div>
+              <div class="btn btn2" @click="resetTaskList">
+                <div class="img2"></div>
+                <div class="wz">重置</div>
+              </div>
+            </div>
+          </div>
+          <div class="btnss" style="margin-top: 20px">
+            <div class="btn btn1" @click="newTest()" style="margin-right: 20px">
+              <div class="wz">新建考试</div>
+            </div>
+          </div>
+          <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
+            <a-table
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tabledata"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              :scroll="{ x: 900 }"
+              @expand="expandTable"
+              :pagination="false"
+            />
+            <div class="tableBox">
+              <div class="pa">
+                <a-pagination
+                  showSizeChanger="true"
+                  showQuickJumper="true"
+                  hideOnSinglePage="true"
+                  :pageSize="pageSize"
+                  :current="currentPage"
+                  :total="tableDataTotal"
+                  class="pagination"
+                  @change="onChange"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="btnn">
+          <button class="btn1">取消</button>
+          <button class="btn2">确定</button>
+        </div>
+      </div>
+    </a-drawer>
+  </template>
+  
+  <script>
+  import { toRefs, reactive, onMounted } from "vue";
+  import * as api from "../../api/index";
+  export default {
+    name: "STest",
+    props: {
+      STvisible: {
+        type: Boolean,
+        default: false,
+      },
+    },
+  
+    setup(props, ctx) {
+      const state = reactive({
+        name: "",
+        pageNo: 1,
+        pageSize: 10,
+        currentPage: 1,
+        tableDataTotal: 0,
+        projectName: "",
+        tabledata: [],
+      });
+      const tableDataFunc = ()=> {
+        {
+            const columns =  [
+                {
+                  title: "工号",
+                  dataIndex: "workNum",
+                  key: "workNum",
+                  width: 50,
+                  align: "center",
+                  className: "h head",
+                },
+                {
+                  title: "姓名",
+                  dataIndex: "userName",
+                  key: "userName",
+                  width: 50,
+                  align: "center",
+                  className: "h head",
+                },
+                {
+                  title: "所在部门",
+                  dataIndex: "deptName",
+                  key: "userName",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "所在岗位",
+                  dataIndex: "jobName",
+                  key: "jobName",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "完成时间",
+                  dataIndex: "time",
+                  key: "time",
+                  width: 100,
+                  align: "center",
+                  className: "h",
+                },
+                {
+                  title: "任务状态",
+                  dataIndex: "status",
+                  key: "status",
+                  width: 60,
+                  align: "center",
+                  className: "h",
+                },
+            ]
+            return columns;
+        } 
+      };
+      const closeDrawer = () => {
+        ctx.emit("update:STvisible", false);
+      };
+      const onChange = (pageNumber) => {
+        console.log("Page: ", pageNumber);
+      };
+      const newTest = ()=> {
+        console.log('111');
+      }
+      //获取任务管理列表
+      const getManageList = () => {
+        let obj = {
+          name: "",
+          pageNo: state.pageNo,
+          pageSize: state.pageSize,
+          projectId: 27,
+          projectTaskId: 370,
+        //   projectTaskId: props.projectTaskId,
+          status: -1,
+        };
+        api
+          .taskStudentList(obj)
+          .then((res) => {
+            state.pageNo = res.data.data.pageNo;
+            state.pageSize = res.data.data.pageSize;
+            state.pageSize = res.data.data.pageSize;
+            for (let i = 0; i < res.data.data.rows.length; i++) {
+              state.tabledata.push(res.data.data.rows[i].userInfoBo);
+            }
+          })
+          .catch((err) => {
+            console.log("获取时间任务列表失败cc", err);
+          });
+      };
+  
+      //搜索任务列表
+      const searchTaskList = () => {
+        let objser = {
+          name: "",
+          pageNo: state.pageNo,
+          pageSize: state.pageSize,
+          projectId: 27,
+        //   projectTaskId: props.projectTaskId,
+          projectTaskId: 370,
+          status: -1,
+        };
+        if (state.name !== "" || state.projectName !== "") {
+          api
+            .taskStudentList(objser)
+            .then((res) => {
+              state.pageNo = res.data.data.pageNo;
+              state.pageSize = res.data.data.pageSize;
+              state.pageSize = res.data.data.pageSize;
+              let newArr = [];
+              for (let i = 0; i < res.data.data.rows.length; i++) {
+                if (res.data.data.rows[i].userInfoBo.userName == state.name)
+                  newArr.push(res.data.data.rows[i].userInfoBo);
+              }
+              state.tabledata = newArr;
+            })
+            .catch((err) => {
+              console.log("搜索任务列表失败", err);
+            });
+        }
+      };
+  
+      //重置任务列表
+      const resetTaskList = () => {
+        state.name = "";
+        state.projectName = "";
+        state.tabledata = [];
+        getManageList();
+      };
+      onMounted(() => {
+        setTimeout(() => {
+          getManageList();
+        }, 500);
+      });
+      return {
+        ...toRefs(state),
+        closeDrawer,
+        newTest,
+        tableDataFunc,
+        onMounted,
+        onChange,
+        getManageList,
+        searchTaskList,
+        resetTaskList,
+      };
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  .TimeManage {
+    // overflow-x: auto;
+    .drawerMain {
+      min-width: 550px;
+      margin: 0px 32px 0px 32px;
+      overflow-x: auto;
+      display: flex;
+      flex-direction: column;
+      .header {
+        height: 73px;
+        border-bottom: 1px solid #e8e8e8;
+        display: flex;
+        flex-shrink: 0;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 20px;
+        .headerTitle {
+          font-size: 18px;
+          font-weight: 600;
+          color: #333333;
+          line-height: 25px;
+        }
+      }
+      .main {
+        width: 100%;
+        height: 100%;
+        overflow-y: auto;
+        padding-right: 10px;
+        .search {
+          width: 100%;
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 20px;
+          justify-content: space-between;
+  
+          .sealeft {
+            display: flex;
+            flex-wrap: wrap;
+            .namecon {
+              display: flex;
+              flex-wrap: nowrap;
+              margin-bottom: 10px;
+              .name {
+                margin-top: 8px;
+                white-space: nowrap;
+              }
+            }
+          }
+          .btns {
+            display: flex;
+            flex-wrap: nowrap;
+  
+            .btn {
+              cursor: pointer;
+              width: 100px;
+              height: 40px;
+              border-radius: 8px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              .img1 {
+                width: 15px;
+                height: 17px;
+                background-image: url(../../assets/images/courseManage/search0.png);
+                background-size: 100% 100%;
+                margin-right: 7px;
+              }
+              .img2 {
+                width: 16px;
+                height: 18px;
+                background-image: url(../../assets/images/courseManage/reset1.png);
+                background-size: 100% 100%;
+                margin-right: 7px;
+              }
+            }
+  
+            .btn1 {
+              background: #409eff;
+  
+              color: #ffffff;
+            }
+            .btn2 {
+              background: #ffffff;
+  
+              color: #388be1;
+              border: 1px solid #388be1;
+            }
+          }
+        }
+        .btnss {
+          display: flex;
+          flex-wrap: nowrap;
+  
+          .btn {
+            cursor: pointer;
+            width: 130px;
+            height: 40px;
+            border-radius: 8px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+  
+          .btn1 {
+            background: #409eff;
+            color: #ffffff;
+          }
+        }
+        .tab {
+          th.h {
+            background-color: #eff4fc !important;
+          }
+  
+          .ant-table-tbody
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
+            background: #f6f9fd;
+          }
+          .tableBox {
+            .pa {
+              // left: 0;
+              margin-top: 15px;
+              width: 100%;
+              // height: 20px;
+              // background-color: red;
+              display: flex;
+              justify-content: center;
+              // position: absolute;
+              // bottom: 20px;
+              .ant-pagination-prev,
+              .ant-pagination-next,
+              .ant-pagination-item,
+              .ant-pagination-options {
+                margin-bottom: 10px;
+              }
+            }
+          }
+        }
+      }
+  
+      .btnn {
+        height: 72px;
+        width: 100%;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        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: #409eff;
+          border-radius: 8px;
+          border: 0;
+          margin-left: 15px;
+          color: #fff;
+        }
+      }
+    }
+  }
+  </style>
+  
\ No newline at end of file

From c1eda5e1b3886dee0bafed92454e0a6811ede919 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 18 Nov 2022 14:09:39 +0800
Subject: [PATCH 70/90] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=85=B3=E5=8D=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 169 ++++++++++++++--------
 1 file changed, 112 insertions(+), 57 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 381f5d86..e785af5b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="leveladddetail">
-    <div class="left clearfix">
+ <div style="display: flex">
+     <div class="left clearfix">
       <div class="leftmain">
         <div class="tit" style="margin-left: 18px">关卡</div>
         <div class="btn btn3" style="margin-left: 19px">
@@ -676,19 +677,7 @@
           <!-- 无数据样式 -->
         </div>
       </div>
-      <div class="footbtn">
-        <div class="btnbox">
-          <div class="btn btn2">
-            <div class="btnText">暂存</div>
-          </div>
-          <div class="btn btn2">
-            <div class="btnText">确定</div>
-          </div>
-          <div class="btn btn1" @click="gqxy_hShow">
-            <div class="btnText">下一步</div>
-          </div>
-        </div>
-      </div>
+    
       <div class="draw" style="position: relative">
         <a-drawer
           v-model:visible="addprojvisible"
@@ -846,6 +835,25 @@
         </div>
       </div>
     </div>
+ </div>
+
+
+
+
+
+      <div class="footbtn">
+        <div class="btnbox">
+          <div class="btn btn2">
+            <div class="btnText">暂存</div>
+          </div>
+          <div class="btn btn2">
+            <div class="btnText">确定</div>
+          </div>
+          <div class="btn btn1">
+            <div class="btnText">取消</div>
+          </div>
+        </div>
+      </div>
     <!-- 添加学员抽屉 -->
     <add-stu v-model:AddSvisible="AddSvisible" />
     <!-- 导入学员抽屉 -->
@@ -2514,6 +2522,7 @@ const closeDeleteChapter=()=>{
 .leveladddetail {
   width: 100%;
   display: flex;
+  flex-direction: column;
   min-width: 933px;
   background-color: rgba(245, 247, 250, 1);
   .left {
@@ -3219,49 +3228,49 @@ const closeDeleteChapter=()=>{
         }
       }
     }
-    .footbtn {
-      width: 100%;
-      flex: 1;
-      background-color: #fff;
-      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
-      display: flex;
-      justify-content: end;
-      .btnbox {
-        display: flex;
-        margin-right: 36px;
-        .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;
-          flex-shrink: 0;
-          margin: 21px 0px 19px 14px;
-          cursor: pointer;
-          white-space: nowrap;
-          .btnText {
-            font-size: 14px;
-            font-weight: 400;
-            line-height: 36px;
-            margin-left: 5px;
-          }
-        }
-        .btn1 {
-          background-color: #409eff;
-          .btnText {
-            color: #ffffff;
-          }
-        }
-        .btn2 {
-          background-color: #ffffff;
-          .btnText {
-            color: #409eff;
-          }
-        }
-      }
-    }
+    // .footbtn {
+    //   width: 100%;
+    //   flex: 1;
+    //   background-color: #fff;
+    //   box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+    //   display: flex;
+    //   justify-content: end;
+    //   .btnbox {
+    //     display: flex;
+    //     margin-right: 36px;
+    //     .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;
+    //       flex-shrink: 0;
+    //       margin: 21px 0px 19px 14px;
+    //       cursor: pointer;
+    //       white-space: nowrap;
+    //       .btnText {
+    //         font-size: 14px;
+    //         font-weight: 400;
+    //         line-height: 36px;
+    //         margin-left: 5px;
+    //       }
+    //     }
+    //     .btn1 {
+    //       background-color: #409eff;
+    //       .btnText {
+    //         color: #ffffff;
+    //       }
+    //     }
+    //     .btn2 {
+    //       background-color: #ffffff;
+    //       .btnText {
+    //         color: #409eff;
+    //       }
+    //     }
+    //   }
+    // }
   }
   .opat {
     .opacationt {
@@ -3321,6 +3330,52 @@ const closeDeleteChapter=()=>{
       margin-left: 10px;
     }
   }
+    .footbtn {
+    width: 100%;
+    height: 80px;
+    margin-top: 16px;
+    // flex: 1;
+    background-color: #fff;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+    display: flex;
+    justify-content: end;
+    .btnbox {
+      display: flex;
+      margin-right: 36px;
+      height: 80px;
+      .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;
+        flex-shrink: 0;
+        margin: 21px 0px 19px 14px;
+        cursor: pointer;
+        white-space: nowrap;
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btn1 {
+        background-color: #409eff;
+        .btnText {
+          color: #ffffff;
+        }
+      }
+      .btn2 {
+        background-color: #ffffff;
+        .btnText {
+          color: #409eff;
+        }
+      }
+    }
+  }
 }
 .CopyModal {
   .ant-modal {

From a29993031d737c9474a1a72e9bdf5f69bf2fe86c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Fri, 18 Nov 2022 14:19:37 +0800
Subject: [PATCH 71/90] =?UTF-8?q?feat:=20=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/FaceManage.vue |  4 ++--
 src/components/drawers/TestManage.vue |  4 ++--
 src/components/drawers/TimeManage.vue |  4 ++--
 src/components/drawers/WorkManage.vue |  4 ++--
 src/views/learningpath/LevelAdd.vue   | 16 ++++++++++++----
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 32bd2e00..343cb622 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -421,13 +421,13 @@ export default {
       state.name = "";
       state.projectName = "";
       state.tabledata = [];
-      getManageList();
+      //getManageList();
     };
 
     let timer;
     onMounted(() => {
       setTimeout(() => {
-       getManageList();
+       //getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 6cafdba1..2a0cb47e 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -405,13 +405,13 @@ export default {
       state.name = "";
       state.projectName = "";
       state.tabledata = [];
-      getManageList();
+     // getManageList();
     };
 
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+      //  getManageList();
       }, 1000);
       
       timer = setInterval(() => {
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 524d3fa2..42acca29 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -389,7 +389,7 @@ export default {
       state.name = "";
       state.projectName = "";
       state.tabledata = [];
-      getManageList();
+      //getManageList();
     };
     const test = ()=> {
       state.CVvisible = true
@@ -397,7 +397,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+       // getManageList();
       }, 500);
       timer = setInterval(() => {
         state.open = false;
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 85c48a20..e6e94552 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -343,12 +343,12 @@ export default {
       state.name = "";
       state.projectName = "";
       state.tabledata = [];
-      getManageList();
+     // getManageList();
     };
 
     onMounted(() => {
       setTimeout(() => {
-       getManageList();
+      // getManageList();
       }, 1000);
     });
     return {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 88914b7a..f6967481 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -625,8 +625,9 @@
                     :pageSize="pageSize"
                     :current="currentPage"
                     :total="tableDataTotal"
+                    @change="pageChange"
                     class="pagination"
-                    style="display: none"
+                    style="display: block"
                   />
                 </div>
               </div>
@@ -1155,7 +1156,7 @@ import FaceStu from "../../components/drawers/FaceStu";
 import ActiveAttendance from "../../components/drawers/ActiveAttendance";
 import TimeManage from "../../components/drawers/TimeManage";
 import TestManage from "../../components/drawers/TestManage";
-import FaceManage from "../../components/drawers/FaceManage";
+import FaceManage from "../../components/drawers/FaceManage"; 
 import WorkManage from "../../components/drawers/WorkManage";
 import SeeStu from "../../components/drawers/SeeStu";
 // import { useRoute } from "vue-router";
@@ -1580,7 +1581,7 @@ export default {
     const getStudent = () => {
       let obj = {
         name: "",
-        pageNo: 1,
+        pageNo: state.currentPage,
         pageSize: 10,
         routerId: 100,
       };
@@ -1589,7 +1590,7 @@ export default {
         .then((res) => {
           console.log("获取学员列表", res);
           let data = res.data.data.rows || null;
-          // state.tableData = [];
+          state.tableData = [];
           if (data.length) {
             for (let i in data) {
               let _time = new Date(data[i].beginStudyTime * 1000);
@@ -1882,6 +1883,7 @@ export default {
             .delStudent({ routerId: 100, studentIds: [id] })
             .then((res) => {
               message.success("删除成功");
+              getStudent()
               console.log(res);
             })
             .catch((err) => {
@@ -1914,12 +1916,17 @@ export default {
       }
       api.delStudent(obj).then((res) => {
         console.log(res);
+        getStudent();
         message.success("批量删除成功")
       }).catch(err => {
         message.error("批量删除失败"+err);
         console.log(err)
       })
     };
+    const pageChange = (value) => {
+      state.currentPage = value;
+      getStudent();
+    }
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -1967,6 +1974,7 @@ export default {
       showStop,
       reget,
       stageChange,
+      pageChange,
     };
   },
 };

From 40f1f3e8f5f64a9d359e499156ca49612b6b6b9b Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 18 Nov 2022 20:24:38 +0800
Subject: [PATCH 72/90] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index1.js                       |   5 +-
 src/components/drawers/UnlockMode.vue   | 209 +++++++++++++++++++
 src/views/learningpath/LearningPath.vue | 267 ++++++++++++++++++++++--
 src/views/projectcenter/TaskAdd.vue     |  20 +-
 4 files changed, 476 insertions(+), 25 deletions(-)
 create mode 100644 src/components/drawers/UnlockMode.vue

diff --git a/src/api/index1.js b/src/api/index1.js
index d7517673..e803b202 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-17 15:41:45
+ * @LastEditTime: 2022-11-18 14:24:33
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -90,3 +90,6 @@ export const billboard = (obj) => http.post('/admin/project/billboard', obj);
 // }).catch(err => {
 // 	console.log(err)
 // })
+
+
+// export const choiceEvaluation = (obj) => http.post('/evaluation/choiceEvaluation', obj);
\ No newline at end of file
diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue
new file mode 100644
index 00000000..d254d75f
--- /dev/null
+++ b/src/components/drawers/UnlockMode.vue
@@ -0,0 +1,209 @@
+<template>
+  <a-drawer
+    :visible="unlockModeVisible"
+    class="drawerStyle unlockmode"
+    placement="right"
+    width="70%"
+    @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="main">
+        <div class="classify">
+          <div
+            v-for="item, index in classify"
+            :key="index"
+            class="classifyItem"
+            @click="selectClassify(item)"
+            :style="{
+              color: item.type === selectClassifyType ? '#FFFFFF' : '#999999',
+              'background-color':
+                item.type === selectClassifyType ? '#409EFF' : '#FFFFFF',
+              border:
+                item.type === selectClassifyType
+                  ? '1px solid #409EFF'
+                  : '1px solid #999999',
+            }"
+          >
+            {{ item.text }}
+          </div>
+        </div>
+<div v-if="selectClassifyType===1" class="type1">
+  <span style="font-weight: 500">描述：</span><span>不设学习限制，学员可以在任何时间学习</span>
+</div>
+   <div v-if="selectClassifyType===2" class="type1 type2">
+  <div><span style="font-weight: 500">描述：</span><span>辩论、活动、测评、调研、投票按照设置时间</span></div>
+<div class="radio">
+  <span>解锁单元：</span>
+  <a-radio v-model:checked="checked">逐个任务解锁</a-radio>
+</div>
+</div>    
+   <div v-if="selectClassifyType===3" class="type1 type3">
+  <div><span style="font-weight: 500">描述：</span><span>前一个阶段达成目标后解锁下一个阶段</span></div>
+<div class="radio" style="display:flex">
+ <div style="margin-top:1px">解锁条件：</div>
+   <a-radio-group v-model:value="radioSelect">
+   <div><a-radio :value="1">逐个任务解锁，完成一个任务后解锁下一个</a-radio></div>
+  <div style="margin-top:24px"> <a-radio :value="2">完成当前阶段所有必修任务解锁下一阶段</a-radio></div>
+ 
+  </a-radio-group>
+  
+</div>
+</div>  
+      </div>
+      <div class="btnn">
+        <button class="btn1">取消</button>
+        <button class="btn2">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { reactive, toRefs } from "vue";
+export default {
+  name: "UnlockMode",
+  props: {
+    unlockModeVisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      classify: [
+        {
+          type: 1,
+          text: "自由学习模式",
+        },
+        {
+          type: 2,
+          text: "按学习时间解锁",
+        },
+        {
+          type: 3,
+          text: "闯关模式",
+        },
+      ],
+      selectClassifyType: 3,
+      checked:true,
+      radioSelect:1,
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:unlockModeVisible", false);
+    };
+
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    const selectClassify = (e) => {
+      state.selectClassifyType = e.type;
+    };
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      // change,
+      selectClassify,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.unlockmode {
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      display: flex;
+      flex-direction: column;
+      .classify {
+        display: flex;
+        .classifyItem {
+          width: 160px;
+          height: 38px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 4px;
+          border: 1px solid #999999;
+          font-size: 16px;
+          font-weight: 500;
+          color: #999999;
+          line-height: 22px;
+          margin-right: 16px;
+          cursor: pointer;
+        }
+      }
+      .type1{
+        margin-top: 50px;
+font-size: 14px;
+font-weight: 400;
+color: #333333;
+line-height: 20px;
+      }
+      .radio{
+        margin-top: 24px;
+      }
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      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/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index abbc4b6e..d59acb71 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -114,11 +114,11 @@
 
     <!-- 表格 -->
 
-    <!-- 创建路径弹窗 -->
+    <!-- 创建路径弹窗 v-model:visible="out" -->
     <a-modal
       :closable="sh"
       centered="true"
-      v-model:visible="out"
+    v-model:visible="out"
       :footer="null"
       wrapClassName="CreatePath"
     >
@@ -194,18 +194,20 @@
             <img class="im" src="../../assets/px.jpg" /> -->
               <div
                 @click="chooseImg(item)"
-                v-for="item in imgData"
+                v-for="item,index in imgData"
                 :key="item.key"
                 class="learnBgItem"
                 :style="{
                   border:
                     learnPathBg === item.id
                       ? '2px solid rgba(78, 166, 255, 1)'
-                      : '1px solid #ccc',
+                      : '1px solid #C7CBD2',
                   'background-image': 'url(' + item.source + ')',
+                   display:index>=5?'none':'flex'
                 }"
-              >
-                <!-- <img class="im" :src="item.source" /> -->
+              ></div>
+              <div @click="showLearnBgMore" v-if="imgData.length > 5" class="learnBgItem learnBgMore">
+                查看更多 <img src="../../assets/images/projectadd/go.png" />
               </div>
             </div>
           </div>
@@ -220,12 +222,13 @@
             <button class="samtn btn1" @click="handleOut">取消</button>
             <button class="samtn btn2" @click="createLearnPath">确定</button>
           </div>
-        </div>
-        <div
-          class="aeLoading"
-          :style="{ display: lpLoading ? 'flex' : 'none' }"
-        >
-          <a-spin :spinning="lpLoading" tip="添加中..." />
+
+          <div
+            class="aeLoading"
+            :style="{ display: lpLoading ? 'flex' : 'none' }"
+          >
+            <a-spin :spinning="lpLoading" tip="添加中..." />
+          </div>
         </div>
       </div>
     </a-modal>
@@ -310,7 +313,7 @@
             <img class="im" src="../../assets/px.jpg" /> -->
               <div
                 @click="chooseImg2(item)"
-                v-for="item in imgData"
+                v-for="(item,index) in imgData"
                 :key="item.key"
                 class="learnBgItem"
                 :style="{
@@ -319,16 +322,13 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #ccc',
                   'background-image': 'url(' + item.source + ')',
+                  display:index>=5?'none':'flex'
                 }"
               >
                 <!-- <img class="im" :src="item.source" /> -->
               </div>
-              <div
-                @click="showImgMore"
-                v-if="imgData.length >= 5"
-                class="learnBgItem"
-              >
-                <!-- <img class="im" :src="item.source" /> -->
+               <div @click="showLearnBgMore" v-if="imgData.length > 5" class="learnBgItem learnBgMore">
+                查看更多 <img src="../../assets/images/projectadd/go.png" />
               </div>
             </div>
           </div>
@@ -344,8 +344,8 @@
             <button class="samtn btn2" @click="editLearnPath">确定</button>
           </div>
         </div>
-      </div></a-modal
-    >
+      </div>
+    </a-modal>
     <!-- 发布弹窗 -->
     <a-modal
       v-model:visible="pub"
@@ -582,6 +582,51 @@
     <power-list v-model:PLvisible="PLvisible" />
 
     <!-- 创建路径loading -->
+
+    <!-- 更多背景图 v-model:visible="learnBgMore"  -->
+    <a-modal
+      :closable="sh"
+      centered="true"
+      v-model:visible="learnBgMore"
+      :footer="null"
+      wrapClassName="learnBgMoreModal"
+      :z-index="9999"
+    >
+      <div class="main">
+        <div class="top">
+          <div class="topc">路径图背景</div>
+          <div @click="closeLearnBgMore">
+            <img
+              style="width: 20px; height: 20px"
+              src="../../assets/images/basicinfo/close.png"
+            />
+          </div>
+        </div>
+        <div class="imagesBox">
+          <div
+            @click="chooseImg2(item)"
+            v-for="item in imgData"
+            :key="item.key"
+            class="learnBgItem"
+            :style="{
+              border:
+                learnPathBg2 === item.id
+                  ? '2px solid rgba(78, 166, 255, 1)'
+                  : '1px solid #ccc',
+              'background-image': 'url(' + item.source + ')',
+            }"
+          >
+            <!-- <img class="im" :src="item.source" /> -->
+          </div>
+
+          
+        </div>
+        <div class="btn">
+            <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+            <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+          </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 <script>
@@ -643,6 +688,69 @@ export default {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
+        {
+          id: 6,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 7,
+          source: require("../../assets/images/leveladd/2.png"),
+        }, {
+          id: 5,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 6,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 7,
+          source: require("../../assets/images/leveladd/2.png"),
+        }, {
+          id: 5,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 6,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 7,
+          source: require("../../assets/images/leveladd/2.png"),
+        }, {
+          id: 5,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 6,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 7,
+          source: require("../../assets/images/leveladd/2.png"),
+        }, {
+          id: 5,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 6,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 7,
+          source: require("../../assets/images/leveladd/2.png"),
+        }, {
+          id: 5,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 6,
+          source: require("../../assets/images/leveladd/3.png"),
+        },
+        {
+          id: 7,
+          source: require("../../assets/images/leveladd/2.png"),
+        },
       ],
       learnPathBg: null, //创建路径选择的路径图背景
       learnPathBg2: null, //编辑路径选择的路径图背景
@@ -734,8 +842,8 @@ export default {
       copyPathId: null, //复制路径iid
 
       lpLoading: false,
+      learnBgMore: false, //是否显示更多学习路径背景
     });
-
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
     };
@@ -1507,6 +1615,28 @@ export default {
       state.endTime = null;
       getLearnPath();
     };
+
+    //     const choiceEvaluation=()=>{
+    //       let obj={
+    //         keyword: "",
+    // 	user_id: 1
+    //       }
+    //       api.choiceEvaluation(obj).then(res=>{
+    // console.log('获取测评列表',res)
+    //       }).catch(err=>{
+    // console.log('获取测评列表失败',err)
+    //       })
+    //     }
+    //     choiceEvaluation()
+
+    //显示更多路径背景弹窗
+    const showLearnBgMore = () => {
+      state.learnBgMore = true;
+    };
+    //关闭更多路径背景弹窗
+    const closeLearnBgMore = () => {
+      state.learnBgMore = false;
+    };
     onMounted(() => {
       // console.log("执行");
       getLearnPath();
@@ -1549,6 +1679,8 @@ export default {
       searchTimeChange,
       searchLearnPath,
       resetLearnPath,
+      showLearnBgMore,
+      closeLearnBgMore,
     };
   },
 };
@@ -1683,6 +1815,7 @@ export default {
                 display: flex;
                 flex-wrap: wrap;
                 min-height: 110px;
+                height: 300px;
                 .learnBgItem {
                   border-radius: 8px;
                   width: 136px;
@@ -1692,6 +1825,17 @@ export default {
                   margin-bottom: 20px;
                   margin-right: 6px;
                 }
+                .learnBgMore {
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  border: 1px solid #c7cbd2;
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #4ea6ff;
+                  line-height: 36px;
+                  cursor: pointer;
+                }
               }
             }
             .info {
@@ -1757,6 +1901,85 @@ export default {
     }
   }
 }
+.learnBgMoreModal {
+  .ant-modal {
+    width: 680px !important;
+    height: 528px !important;
+    .ant-modal-content {
+      width: 680px !important;
+      height: 528px !important;
+      .ant-modal-body {
+        width: 680px !important;
+        height: 528px !important;
+        padding: 0 !important;
+       .main{
+        display: flex;
+        flex-direction: column;
+         .top {
+          padding-left: 51px;
+          padding-right: 51px;
+          padding-top: 28px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          cursor: pointer;
+          .topc {
+            font-size: 16px;
+            font-weight: bold;
+            color: #000000;
+            line-height: 36px;
+          }
+        }
+        .imagesBox{
+          display: flex;
+        //  justify-content: space-between;
+        flex-wrap: wrap;
+           padding-left: 51px;
+          padding-right: 39px;
+          margin-top: 20px;
+          height: 350px;
+          overflow-y: auto;
+          .learnBgItem{
+              border-radius: 8px;
+                  width: 136px;
+                  height: 106px;
+                  background-size: 100%;
+                  background-repeat: no-repeat;
+                  margin-bottom: 20px;
+                  margin-right: 10px;
+          }
+
+        }
+         .btn {
+          width: 100%;
+             position: absolute;
+             bottom:30px ;
+              margin-top: 30px;
+              display: flex;
+             justify-content: center;
+              .samtn {
+                width: 100px;
+                height: 40px;
+                font-size: 14px;
+                border: 1px solid #4ea6ff;
+                border-radius: 8px;
+                cursor: pointer;
+              }
+              .btn1 {
+                background-color: #fff;
+                color: #4ea6ff;
+              }
+              .btn2 {
+                background-color: #4ea6ff;
+                color: #fff;
+                margin-left: 16px;
+              }
+            }
+       }
+      }
+    }
+  }
+}
 .pub {
   .ant-modal {
     .ant-modal-body {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index f7d78270..f3ca1cc7 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -137,9 +137,12 @@
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
-                  <div class="bottonbox">
+                  <!-- v-model:unlockModeVisible="unlockModeVisible" -->
+                  <div class="bottonbox"  @click="showModeVisible">
                     <div class="btnText">切换模式</div>
                   </div>
+                   <!-- 切换模式抽屉 -->
+    <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
                 </div>
               </div>
               <div class="line"></div>
@@ -1020,6 +1023,9 @@
         </div>
       </div>
     </a-modal>
+
+
+   
   </div>
 </template>
 
@@ -1044,7 +1050,7 @@ import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-
+import UnlockMode from '../../components/drawers/UnlockMode.vue'
 const drawercolumns = [
   {
     title: "项目名称",
@@ -1100,6 +1106,7 @@ export default {
     AddEval,
     AddInvist,
     AddVote,
+    UnlockMode,
   },
   setup() {
     const state = reactive({
@@ -1291,6 +1298,8 @@ export default {
       updateStageID: null, //编辑阶段id
       deleteStageId:null,//删除阶段的id
       deleteStageModal:false,//删除阶段弹窗
+
+unlockModeVisible:false,//切换模式抽屉
     });
     console.log("projectId", state.projectId);
     const selectProjectName = (value, index) => {
@@ -2021,6 +2030,11 @@ const closeDeleteStage=()=>{
       console.log("阶段改变", value, option);
       state.removeStageId = option.id;
     };
+
+    //显示切换模式抽屉
+    const showModeVisible=()=>{
+state.unlockModeVisible=true
+    }
     return {
       ...toRefs(state),
       selectProjectName,
@@ -2075,6 +2089,8 @@ const closeDeleteStage=()=>{
       showDeleteStage,
       closeDeleteStage,
       deleteStage,
+
+      showModeVisible,
     };
   },
 };

From 345e40271ee2d832d0e3bae02d16ea5707b083f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Fri, 18 Nov 2022 21:49:19 +0800
Subject: [PATCH 73/90] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=B7=AF=E5=BE=84=E5=9B=BE=E8=AE=BE=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=20style?=
 =?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/index1.js                   |   3 ++-
 src/assets/images/doc.png           | Bin 0 -> 477 bytes
 src/views/learningpath/LevelAdd.vue |  34 ++++++++++++++++++++++++----
 3 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/images/doc.png

diff --git a/src/api/index1.js b/src/api/index1.js
index e803b202..583c9686 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -59,7 +59,8 @@ export const getChapter = (obj) => http.post('/admin/router/detail', { params: o
 
 //新建或编辑关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
-
+// 编辑路径图设置
+export const setConfig = (obj) => http.post('/admin/router/setConfig', obj);
 //获取学员列表
 export const getStudent = (obj) => http.post('/admin/router/studentList', obj);
 //获取路径图详情-包含关卡及任务列表
diff --git a/src/assets/images/doc.png b/src/assets/images/doc.png
new file mode 100644
index 0000000000000000000000000000000000000000..90f2632f06e7707cd272a1cb4106814bb1719347
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004`Nkl<ZSV!%b
z!Ab%_9LB#fOjfe&4e9|}Jw+V?sY4Qh*E|RX^#oCxUAmR_4!uDTg2$pf2qHlWU87qp
zWTjrDjs3@ng6Xa^rYjzHE(<%~%>3s2e>=-Cv|2D;ixANf7*+sGwcr2exw++e^UqT>
zsVWbm@r(=9liC_HC?^uj_J`J|p$6RzP1D07h$cWFUb_NlPj&&3jst`?Jou;>4NaqP
zQgvH8(E_Lz04$3pmhEo?aJ>kk2@p(F^F&ycT|lJk1Q0=t1)v|q*Z`~`#tL8t@dv=?
zV>nFAh)RrNK}R;zu+(*Dpj+4(%pM1J_q{@Z*OwpM-+f!^78b?lnBsNicVfzcEhP}{
z003hw^K>yAaR7Q8-~sB_>UF|nQI~PKug0_lJUlWXJUgx11Hfk$CAji#fV(hkb3!<o
z4#*zGX7wL5n5GVRJPgs8GH|}WJ`LPlTmKu(CY;O?47~Lr1~?8l4osE<f%s@ICXydV
zwv?LNw&iLj13*NV<+T6UmdmLG00FM0Qp)$-1mJCy*K=zCrUR5CqVsavf6H~h>)=5M
TQ^+wR00000NkvXXu0mjf@{!43

literal 0
HcmV?d00001

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f6967481..ed6b2467 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -763,19 +763,20 @@
                       <div
                         v-for="item in docList"
                         :key="item.src"
+                        style="margin-top: 20px;"
                         class="docListStyle"
                       >
                         <img
-                          src="@/assets/images/basicinfo/download.png"
+                          src="@/assets/images/doc.png"
                           style="
                             cursor: pointer;
-                            width: 40px;
-                            height: 40px;
-                            margin-right: 40px;
+                            width: 30px;
+                            height: 25px;
+                            margin-right: 10px;
                           "
                           alt=""
                         />
-                        <span style="font: oblique 16px Sans-serif">{{
+                        <span style="font: oblique bolder 16px 宋体">{{
                           item.name
                         }}</span>
                         <span style="color: #4ea6ff; float: right">删除</span>
@@ -1927,6 +1928,28 @@ export default {
       state.currentPage = value;
       getStudent();
     }
+    const setconfig = () => {
+      let obj = {
+        "autoJoinFlag": 0,
+          "deptBoList": [
+            {
+              "deptId": 0,
+              "deptName": ""
+            }
+          ],
+          "preLearnFlag": 0,
+          "previewFlag": 0,
+          "routerId": 0,
+          "showFlag": 0
+      }
+      api.setConfig(obj).then((res) => {
+        message.success("编辑成功")
+        console.log(res);
+      }).catch(err => {
+        console.log(err);
+        message.error("编辑失败")
+      })
+    }
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -1975,6 +1998,7 @@ export default {
       reget,
       stageChange,
       pageChange,
+      setconfig,
     };
   },
 };

From a01686ffe34ff24ad62259d7c58119afc60e5fb4 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sun, 20 Nov 2022 18:08:46 +0800
Subject: [PATCH 74/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=8F=8A=E9=A1=B9=E7=9B=AE=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=9A=84=E7=BB=9F=E8=AE=A1,=E5=A2=9E=E5=8A=A0=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |   19 +-
 src/api/index.js                          |   12 +-
 src/api/index1.js                         |   11 +-
 src/api/method.js                         |  204 +--
 src/components/drawers/UnlockMode.vue     |   80 +-
 src/store/index.js                        |   25 +-
 src/views/learningpath/LearningPath.vue   |  200 +--
 src/views/learningpath/LevelAddDetail.vue | 1528 +++++++++++----------
 src/views/projectcenter/ProjectAdd.vue    |   80 +-
 src/views/projectcenter/ProjectManage.vue |   79 +-
 src/views/projectcenter/TaskAdd.vue       |   68 +-
 src/views/system/SystemManage.vue         |  268 ++--
 12 files changed, 1312 insertions(+), 1262 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7ab55e6d..f3620e3e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,11 +18,13 @@
 <script>
 import { computed, defineComponent } from "vue";
 import { useRouter, useRoute } from "vue-router";
+import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
 import BreadCrumb from "@/components/BreadCrumb";
 import zhCN from "ant-design-vue/es/locale/zh_CN";
+import * as api from "./api/index1";
 export default defineComponent({
   components: {
     NavLeft,
@@ -33,13 +35,28 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const store = useStore();
     // console.log("router", router.getRoutes(), route);
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
 
     const currentRouteName = computed(() => route.name);
-
+    //获取组织树
+    const orgTree = () => {
+      api
+        .orgtree()
+        .then((res) => {
+          console.log("获取集团组织成功", res);
+          if (res.status === 200) {
+            store.commit("getOrgtreeList", res.data.data);
+          }
+        })
+        .catch((err) => {
+          console.log("获取集团组织失败", err);
+        });
+    };
+    orgTree();
     return {
       routes,
       name: currentRouteName,
diff --git a/src/api/index.js b/src/api/index.js
index 1bfecc7f..919f540b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-15 16:43:26
+ * @LastEditTime: 2022-11-20 17:45:37
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -54,9 +54,9 @@ export const getProjectList = (obj) => http.post('/admin/project/list', obj)
 // 获取项目详情信息（包含阶段及任务列表）
 export const getProjectDetail = (obj) => http.get('/admin/project/detail', { params: obj })
 //发布项目
-export const releaseProject=(obj)=>http.post('/admin/project/publish',obj)
+export const releaseProject = (obj) => http.post('/admin/project/publish', obj)
 //获取项目学员
-export const projectStudent=(obj)=>http.post('/admin/project/studentList',obj)
+export const projectStudent = (obj) => http.post('/admin/project/studentList', obj)
 //撤回发布、结束
 export const handleProject = (obj) => http.post('/admin/project/handle', obj)
 
@@ -65,7 +65,9 @@ export const taskStudentList = (obj) => http.post('/admin/project/taskStudentLis
 
 
 //获取讨论信息
-export const getDiscussDetail=(obj)=>http.post('/discuss/getDiscussDetail',obj)
+export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj)
 
 //获取模版列表
-export const getTemplate=(obj)=>http.post('/admin/project/template/list',obj)
+export const getTemplate = (obj) => http.post('/admin/project/template/list', obj)
+//获取项目统计
+export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
\ No newline at end of file
diff --git a/src/api/index1.js b/src/api/index1.js
index e803b202..2efd8ca7 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-18 14:24:33
+ * @LastEditTime: 2022-11-20 15:39:38
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -53,7 +53,8 @@ export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
 export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
 //学习路径图的发布、停用、删除
 export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj);
-
+//获取路径图统计数据
+export const getLearnCount = (routerId) => http.get('/admin/router/getCount', { params: { routerId: routerId } })
 //获取关卡
 export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });
 
@@ -83,6 +84,12 @@ export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj);
 export const billboard = (obj) => http.post('/admin/project/billboard', obj);
 //项目基础信息-----------------------------------
 
+
+// 获取组织结构树
+export const orgtree = () => http.get('/org/tree');
+
+
+
 // 测试方法
 // import * as api from '../../api/index'
 // api.getLearnPath({}).then(res => {
diff --git a/src/api/method.js b/src/api/method.js
index 4fb3d4ff..e9d7a28d 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -162,211 +162,13 @@ function autoComma(number) {
 		return 0;
 	}
 }
-const commonData={
-	timeout:50
+const commonData = {
+	timeout: 50
 }
 
 
 //组织树
-const  organizationalTree= [
-	{
-		title: "京东方",
-		value: "京东方",
-		children: [
-			{
-				title: "产研部",
-				value: "产研部",
-				children: [
-					{
-						title: "产品部",
-						value: "产品部",
-					},
-					{
-						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",
-					},
-				],
-			},
-			{
-				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: "行政部",
-						value: "行政部",
-					},
-				],
-			},
-		],
-	},
-]
+const organizationalTree = []
 export {
 	toDate,
 	getWeek,
diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue
index d254d75f..22e5c839 100644
--- a/src/components/drawers/UnlockMode.vue
+++ b/src/components/drawers/UnlockMode.vue
@@ -18,7 +18,7 @@
       <div class="main">
         <div class="classify">
           <div
-            v-for="item, index in classify"
+            v-for="(item, index) in classify"
             :key="index"
             class="classifyItem"
             @click="selectClassify(item)"
@@ -35,28 +35,41 @@
             {{ item.text }}
           </div>
         </div>
-<div v-if="selectClassifyType===1" class="type1">
-  <span style="font-weight: 500">描述：</span><span>不设学习限制，学员可以在任何时间学习</span>
-</div>
-   <div v-if="selectClassifyType===2" class="type1 type2">
-  <div><span style="font-weight: 500">描述：</span><span>辩论、活动、测评、调研、投票按照设置时间</span></div>
-<div class="radio">
-  <span>解锁单元：</span>
-  <a-radio v-model:checked="checked">逐个任务解锁</a-radio>
-</div>
-</div>    
-   <div v-if="selectClassifyType===3" class="type1 type3">
-  <div><span style="font-weight: 500">描述：</span><span>前一个阶段达成目标后解锁下一个阶段</span></div>
-<div class="radio" style="display:flex">
- <div style="margin-top:1px">解锁条件：</div>
-   <a-radio-group v-model:value="radioSelect">
-   <div><a-radio :value="1">逐个任务解锁，完成一个任务后解锁下一个</a-radio></div>
-  <div style="margin-top:24px"> <a-radio :value="2">完成当前阶段所有必修任务解锁下一阶段</a-radio></div>
- 
-  </a-radio-group>
-  
-</div>
-</div>  
+        <div v-if="selectClassifyType === 1" class="type1">
+          <span style="font-weight: 500">描述：</span
+          ><span>不设学习限制，学员可以在任何时间学习</span>
+        </div>
+        <div v-if="selectClassifyType === 2" class="type1 type2">
+          <div>
+            <span style="font-weight: 500">描述：</span
+            ><span>辩论、活动、测评、调研、投票按照设置时间</span>
+          </div>
+          <div class="radio">
+            <span>解锁单元：</span>
+            <a-radio v-model:checked="checked">逐个任务解锁</a-radio>
+          </div>
+        </div>
+        <div v-if="selectClassifyType === 3" class="type1 type3">
+          <div>
+            <span style="font-weight: 500">描述：</span
+            ><span>前一个阶段达成目标后解锁下一个阶段</span>
+          </div>
+          <div class="radio" style="display: flex">
+            <div style="margin-top: 1px">解锁条件：</div>
+            <a-radio-group v-model:value="radioSelect">
+              <div>
+                <a-radio :value="1"
+                  >逐个任务解锁，完成一个任务后解锁下一个</a-radio
+                >
+              </div>
+              <div style="margin-top: 24px">
+                <a-radio :value="2"
+                  >完成当前阶段所有必修任务解锁下一阶段</a-radio
+                >
+              </div>
+            </a-radio-group>
+          </div>
+        </div>
       </div>
       <div class="btnn">
         <button class="btn1">取消</button>
@@ -92,11 +105,14 @@ export default {
           text: "闯关模式",
         },
       ],
-      selectClassifyType: 3,
-      checked:true,
-      radioSelect:1,
+      selectClassifyType: 1,
+      checked: true,
+      radioSelect: 1,
     });
     const closeDrawer = () => {
+      state.selectClassifyType = 1;
+      state.checked = true;
+      state.radioSelect = 1;
       ctx.emit("update:unlockModeVisible", false);
     };
 
@@ -163,14 +179,14 @@ export default {
           cursor: pointer;
         }
       }
-      .type1{
+      .type1 {
         margin-top: 50px;
-font-size: 14px;
-font-weight: 400;
-color: #333333;
-line-height: 20px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #333333;
+        line-height: 20px;
       }
-      .radio{
+      .radio {
         margin-top: 24px;
       }
     }
diff --git a/src/store/index.js b/src/store/index.js
index e58b00ac..fbdb9ea0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,3 +1,11 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-20 16:06:52
+ * @FilePath: /fe-manage/src/store/index.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import { createStore } from "vuex";
 
 export default createStore({
@@ -5,15 +13,17 @@ export default createStore({
     openpages: localStorage.getItem("openpages")
       ? JSON.parse(localStorage.getItem("openpages"))
       : [
-          {
-            pagename: "学习路径",
-            href: "/learningpath",
-            active: true,
-          },
-        ],
+        {
+          pagename: "学习路径",
+          href: "/learningpath",
+          active: true,
+        },
+      ],
 
     assessmentName: "",
     routerId: null,
+
+    orgtreeList: [],
   },
   getters: {},
   mutations: {
@@ -31,6 +41,9 @@ export default createStore({
       console.log("state.assessmentName");
       console.log(state.assessmentName);
     },
+    getOrgtreeList(state, orgtreeList) {
+      state.orgtreeList = orgtreeList;
+    }
   },
   actions: {},
   modules: {},
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index d59acb71..7e7a1fed 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -118,7 +118,7 @@
     <a-modal
       :closable="sh"
       centered="true"
-    v-model:visible="out"
+      v-model:visible="out"
       :footer="null"
       wrapClassName="CreatePath"
     >
@@ -194,7 +194,7 @@
             <img class="im" src="../../assets/px.jpg" /> -->
               <div
                 @click="chooseImg(item)"
-                v-for="item,index in imgData"
+                v-for="(item, index) in imgData"
                 :key="item.key"
                 class="learnBgItem"
                 :style="{
@@ -203,10 +203,14 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #C7CBD2',
                   'background-image': 'url(' + item.source + ')',
-                   display:index>=5?'none':'flex'
+                  display: index >= 5 ? 'none' : 'flex',
                 }"
               ></div>
-              <div @click="showLearnBgMore" v-if="imgData.length > 5" class="learnBgItem learnBgMore">
+              <div
+                @click="showLearnBgMore"
+                v-if="imgData.length > 5"
+                class="learnBgItem learnBgMore"
+              >
                 查看更多 <img src="../../assets/images/projectadd/go.png" />
               </div>
             </div>
@@ -313,7 +317,7 @@
             <img class="im" src="../../assets/px.jpg" /> -->
               <div
                 @click="chooseImg2(item)"
-                v-for="(item,index) in imgData"
+                v-for="(item, index) in imgData"
                 :key="item.key"
                 class="learnBgItem"
                 :style="{
@@ -322,12 +326,16 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #ccc',
                   'background-image': 'url(' + item.source + ')',
-                  display:index>=5?'none':'flex'
+                  display: index >= 5 ? 'none' : 'flex',
                 }"
               >
                 <!-- <img class="im" :src="item.source" /> -->
               </div>
-               <div @click="showLearnBgMore" v-if="imgData.length > 5" class="learnBgItem learnBgMore">
+              <div
+                @click="showLearnBgMore"
+                v-if="imgData.length > 5"
+                class="learnBgItem learnBgMore"
+              >
                 查看更多 <img src="../../assets/images/projectadd/go.png" />
               </div>
             </div>
@@ -392,7 +400,9 @@
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">路径信息</div>
-            <div class="messagege">当前路径共0个关卡，0个任务</div>
+            <div class="messagege">
+              当前路径共{{ routeChapters }}个关卡，{{ routeTasks }}个任务
+            </div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
@@ -618,13 +628,11 @@
           >
             <!-- <img class="im" :src="item.source" /> -->
           </div>
-
-          
         </div>
         <div class="btn">
-            <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
-            <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
-          </div>
+          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        </div>
       </div>
     </a-modal>
   </div>
@@ -695,7 +703,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -706,7 +715,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -717,7 +727,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -728,7 +739,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -739,7 +751,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -836,7 +849,9 @@ export default {
       endTime: null, //结束时间
       //发布---------------
       releasePathId: null, //发布路径id
-      routeStudentsNum: 0,
+      routeStudentsNum: 0, //学员总数
+      routeChapters: 0, //关卡总数
+      routeTasks: 0, //任务总数
       recallPathId: null, //撤回路径id
       stopPathId: null, //停用路径id
       copyPathId: null, //复制路径iid
@@ -881,32 +896,19 @@ export default {
     const showPub = (routerId) => {
       state.pub = true;
       state.releasePathId = routerId;
-      //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        routerId: routerId,
-      };
       api
-        .getStudent(obj)
+        .getLearnCount(routerId)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("res", res.data.data);
-            state.routeStudentsNum = res.data.data.total;
+            // console.log("获取关卡、任务、学员统计数据", res.data);
+            state.routeStudentsNum = res.data.students;
+            state.routeChapters = res.data.chapters;
+            state.routeTasks = res.data.tasks;
           }
         })
         .catch((err) => {
           console.log("err", err);
         });
-      //获取学习路径详细信息
-      api
-        .getRouterDetail(routerId)
-        .then((res) => {
-          console.log("学习路径详情", res);
-        })
-        .catch((err) => {
-          console.log("学习路径详情获取错误", err);
-        });
     };
     //确定发布
     const releaseLearnPath = () => {
@@ -1641,6 +1643,7 @@ export default {
       // console.log("执行");
       getLearnPath();
     });
+
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1912,70 +1915,69 @@ export default {
         width: 680px !important;
         height: 528px !important;
         padding: 0 !important;
-       .main{
-        display: flex;
-        flex-direction: column;
-         .top {
-          padding-left: 51px;
-          padding-right: 51px;
-          padding-top: 28px;
+        .main {
           display: flex;
-          align-items: center;
-          justify-content: space-between;
-          cursor: pointer;
-          .topc {
-            font-size: 16px;
-            font-weight: bold;
-            color: #000000;
-            line-height: 36px;
-          }
-        }
-        .imagesBox{
-          display: flex;
-        //  justify-content: space-between;
-        flex-wrap: wrap;
-           padding-left: 51px;
-          padding-right: 39px;
-          margin-top: 20px;
-          height: 350px;
-          overflow-y: auto;
-          .learnBgItem{
-              border-radius: 8px;
-                  width: 136px;
-                  height: 106px;
-                  background-size: 100%;
-                  background-repeat: no-repeat;
-                  margin-bottom: 20px;
-                  margin-right: 10px;
-          }
-
-        }
-         .btn {
-          width: 100%;
-             position: absolute;
-             bottom:30px ;
-              margin-top: 30px;
-              display: flex;
-             justify-content: center;
-              .samtn {
-                width: 100px;
-                height: 40px;
-                font-size: 14px;
-                border: 1px solid #4ea6ff;
-                border-radius: 8px;
-                cursor: pointer;
-              }
-              .btn1 {
-                background-color: #fff;
-                color: #4ea6ff;
-              }
-              .btn2 {
-                background-color: #4ea6ff;
-                color: #fff;
-                margin-left: 16px;
-              }
+          flex-direction: column;
+          .top {
+            padding-left: 51px;
+            padding-right: 51px;
+            padding-top: 28px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            cursor: pointer;
+            .topc {
+              font-size: 16px;
+              font-weight: bold;
+              color: #000000;
+              line-height: 36px;
             }
-       }
+          }
+          .imagesBox {
+            display: flex;
+            //  justify-content: space-between;
+            flex-wrap: wrap;
+            padding-left: 51px;
+            padding-right: 39px;
+            margin-top: 20px;
+            height: 350px;
+            overflow-y: auto;
+            .learnBgItem {
+              border-radius: 8px;
+              width: 136px;
+              height: 106px;
+              background-size: 100%;
+              background-repeat: no-repeat;
+              margin-bottom: 20px;
+              margin-right: 10px;
+            }
+          }
+          .btn {
+            width: 100%;
+            position: absolute;
+            bottom: 30px;
+            margin-top: 30px;
+            display: flex;
+            justify-content: center;
+            .samtn {
+              width: 100px;
+              height: 40px;
+              font-size: 14px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+            .btn1 {
+              background-color: #fff;
+              color: #4ea6ff;
+            }
+            .btn2 {
+              background-color: #4ea6ff;
+              color: #fff;
+              margin-left: 16px;
+            }
+          }
+        }
       }
     }
   }
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index e785af5b..6780fa61 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1,87 +1,87 @@
 <template>
   <div class="leveladddetail">
- <div style="display: flex">
-     <div class="left clearfix">
-      <div class="leftmain">
-        <div class="tit" style="margin-left: 18px">关卡</div>
-        <div class="btn btn3" style="margin-left: 19px">
-          <div class="search"></div>
-          <div class="btnText" @click="showModal()">添加关卡</div>
-        </div>
-        <div class="maincon" style="background-color: #fff">
-          <!-- <div
+    <div style="display: flex">
+      <div class="left clearfix">
+        <div class="leftmain">
+          <div class="tit" style="margin-left: 18px">关卡</div>
+          <div class="btn btn3" style="margin-left: 19px">
+            <div class="search"></div>
+            <div class="btnText" @click="showModal()">添加关卡</div>
+          </div>
+          <div class="maincon" style="background-color: #fff">
+            <!-- <div
             class="items"
             :class="{ active: isActive == true }"
             @click="changebgc"
             v-for="item in level"
             :key="item.id"
           > -->
-          <draggable
-            v-model="level"
-            chosenClass="chosen"
-            ghostClass="ghost"
-            forceFallback="true"
-            group="stage"
-            animation="500"
-          >
-            <template #item="{ element }">
-              <div
-                class="items"
-                :class="isactive == element.chapterId ? 'active' : ''"
-                @click="changebgc(element.chapterId)"
-              >
-                <div class="items1">
-                  <div class="boxs_left">
-                    <a-popover placement="topLeft" trigger="click">
+            <draggable
+              v-model="level"
+              chosenClass="chosen"
+              ghostClass="ghost"
+              forceFallback="true"
+              group="stage"
+              animation="500"
+            >
+              <template #item="{ element }">
+                <div
+                  class="items"
+                  :class="isactive == element.chapterId ? 'active' : ''"
+                  @click="changebgc(element.chapterId)"
+                >
+                  <div class="items1">
+                    <div class="boxs_left">
+                      <a-popover placement="topLeft" trigger="click">
+                        <template #content>
+                          <div style="width: 130px">
+                            {{ element.remark ? element.remark : "暂无说明" }}
+                          </div>
+                        </template>
+                        <template #title>
+                          <span>关卡说明</span>
+                        </template>
+                        <div class="script">
+                          <span style="font-size: 12px; color: #ffffff"
+                            >说明</span
+                          >
+                        </div>
+                      </a-popover>
+                      <div class="imgIcon" @click="showModal(element)"></div>
+                    </div>
+                    <div class="boxs_right">
+                      <div
+                        class="imgIcon"
+                        @click="showDeleteChapter(element.chapterId)"
+                      ></div>
+                    </div>
+                  </div>
+                  <div class="items2">
+                    <a-popover
+                      placement="topLeft"
+                      v-if="element.name.length > 10"
+                    >
                       <template #content>
                         <div style="width: 130px">
-                          {{ element.remark ? element.remark : "暂无说明" }}
+                          {{ element.name }}
                         </div>
                       </template>
-                      <template #title>
-                        <span>关卡说明</span>
-                      </template>
-                      <div class="script">
-                        <span style="font-size: 12px; color: #ffffff"
-                          >说明</span
-                        >
-                      </div>
-                    </a-popover>
-                    <div class="imgIcon" @click="showModal(element)"></div>
-                  </div>
-                  <div class="boxs_right">
-                    <div
-                      class="imgIcon"
-                      @click="showDeleteChapter(element.chapterId)"
-                    ></div>
-                  </div>
-                </div>
-                <div class="items2">
-                  <a-popover
-                    placement="topLeft"
-                    v-if="element.name.length > 10"
-                  >
-                    <template #content>
-                      <div style="width: 130px">
+                      <div class="nname">
                         {{ element.name }}
                       </div>
-                    </template>
-                    <div class="nname">
+                    </a-popover>
+                    <div class="nname" v-if="element.name.length <= 10">
                       {{ element.name }}
                     </div>
-                  </a-popover>
-                  <div class="nname" v-if="element.name.length <= 10">
-                    {{ element.name }}
                   </div>
-                </div>
-                <!-- <div class="itemle">
+                  <!-- <div class="itemle">
               <div class="tit">{{ item.remark }}</div>
               <div class="name">{{ item.name }}</div>
             </div> -->
-              </div>
-            </template>
-          </draggable>
-          <!-- <div
+                </div>
+              </template>
+            </draggable>
+            <!-- <div
             class="items"
             :class="isactive == index ? 'active' : ''"
             @click="changebgc(index)"
@@ -103,661 +103,686 @@
               <div class="nname">{{ item.name }}</div>
             </div>
           </div> -->
-        </div>
-      </div>
-    </div>
-    <a-modal
-      v-model:visible="modal"
-      centered="true"
-      :footer="null"
-      :closable="clos"
-      wrapClassName="AddLevell"
-       @cancel="closeModal"
-    >
-      <div class="header">
-        <div class="headmain">
-          <div class="add">编辑/添加关卡</div>
-          <div class="img" style="cursor: pointer" @click="closeModal"></div>
-        </div>
-      </div>
-      <div class="main">
-        <div class="inma">
-          <div class="name">
-            <div class="d" style="margin-top: 2px; margin-right: 2px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="fir">关卡名称：</div>
-            <div class="input">
-              <a-input
-                style="width: 100%"
-                v-model:value="value1"
-                :maxlength="20"
-                placeholder="请输入关卡名称"
-              />
-            </div>
-            <div class="co">{{ value1.length }}/20</div>
-          </div>
-          <div class="name">
-            <div
-              class="d"
-              style="
-                width: 10px;
-                height: 10px;
-                margin-top: 2px;
-                margin-right: 2px;
-              "
-            ></div>
-            <div class="fir">关卡说明：</div>
-            <div class="input">
-              <a-textarea
-                style="width: 100%"
-                v-model:value="value2"
-                :maxlength="100"
-                placeholder="请输入关卡说明"
-                :rows="5"
-              />
-            </div>
-            <div class="co1">{{ value2.length }}/100</div>
-          </div>
-          <div class="btn">
-            <button class="btn1" @click="closeModal">取消</button>
-            <button class="btn2" @click="editChapter">确定</button>
           </div>
         </div>
       </div>
-    </a-modal>
-    <div class="right" :style="{ display: gqxy_hs ? 'block' : 'none' }">
-      <div class="addhead">
-        <div class="filt">
-          <div class="le">
-            <div class="leftimg">
-              <img class="img" :src="picUrl" />
+      <a-modal
+        v-model:visible="modal"
+        centered="true"
+        :footer="null"
+        :closable="clos"
+        wrapClassName="AddLevell"
+        @cancel="closeModal"
+      >
+        <div class="header">
+          <div class="headmain">
+            <div class="add">编辑/添加关卡</div>
+            <div class="img" style="cursor: pointer" @click="closeModal"></div>
+          </div>
+        </div>
+        <div class="main">
+          <div class="inma">
+            <div class="name">
+              <div class="d" style="margin-top: 2px; margin-right: 2px">
+                <img
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
+                />
+              </div>
+              <div class="fir">关卡名称：</div>
+              <div class="input">
+                <a-input
+                  style="width: 100%"
+                  v-model:value="value1"
+                  :maxlength="20"
+                  placeholder="请输入关卡名称"
+                />
+              </div>
+              <div class="co">{{ value1.length }}/20</div>
             </div>
-            <div class="imgfor">
-              <div class="forz">{{ styTitle }}</div>
-              <div class="fort">创建时间：{{ creTime }}</div>
+            <div class="name">
+              <div
+                class="d"
+                style="
+                  width: 10px;
+                  height: 10px;
+                  margin-top: 2px;
+                  margin-right: 2px;
+                "
+              ></div>
+              <div class="fir">关卡说明：</div>
+              <div class="input">
+                <a-textarea
+                  style="width: 100%"
+                  v-model:value="value2"
+                  :maxlength="100"
+                  placeholder="请输入关卡说明"
+                  :rows="5"
+                />
+              </div>
+              <div class="co1">{{ value2.length }}/100</div>
+            </div>
+            <div class="btn">
+              <button class="btn1" @click="closeModal">取消</button>
+              <button class="btn2" @click="editChapter">确定</button>
             </div>
           </div>
-          <div class="rightt">
-            <div class="select">
-              <span>学习模式：</span>
-              <div class="inputbox">
-                <input type="text" placeholder="按学习时间解锁" />
-                <div class="bottonbox"><div class="btnText">切换模式</div></div>
+        </div>
+      </a-modal>
+      <div class="right" :style="{ display: gqxy_hs ? 'block' : 'none' }">
+        <div class="addhead">
+          <div class="filt">
+            <div class="le">
+              <div class="leftimg">
+                <img class="img" :src="picUrl" />
+              </div>
+              <div class="imgfor">
+                <div class="forz">{{ styTitle }}</div>
+                <div class="fort">创建时间：{{ creTime }}</div>
               </div>
             </div>
-            <div class="line"></div>
-            <router-link to="/leveladd">
-              <div style="display: flex">
-                <img class="img2" src="../../assets/images/leveladd/back.png" />
-                <div class="return">返回</div>
+            <div class="rightt">
+              <div class="select">
+                <span>学习模式：</span>
+                <div class="inputbox">
+                  <input type="text" placeholder="按学习时间解锁" />
+                  <div class="bottonbox" @click="showModeVisible">
+                    <div class="btnText">切换模式</div>
+                  </div>
+                </div>
+                <!-- 切换模式抽屉 -->
+                <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
               </div>
-            </router-link>
+              <div class="line"></div>
+              <router-link to="/leveladd">
+                <div style="display: flex">
+                  <img
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
+                  />
+                  <div class="return">返回</div>
+                </div>
+              </router-link>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="mid">
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddOnline()">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zai.png" />
+        <div class="mid">
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddOnline()">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zai.png" />
+              </div>
+              <div class="text">在线</div>
             </div>
-            <div class="text">在线</div>
-          </div>
-          <!-- 添加在线侧弹窗 -->
-          <div>
-            <add-online
-              v-model:addonlineVisible="addonlinevisible"
-              @changeData="updateTableData"
-              v-model:edit="edit"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:EditOnlineId="EditOnlineId"
-            />
-          </div>
-          <!-- 添加在线侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/mian.png" />
-            </div>
-            <div class="text">面授</div>
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddCase()">
-            <div class="img">
-              <img src="../../assets/images/leveladd/an.png" />
-            </div>
-            <div class="text">案例</div>
-          </div>
-          <!-- 添加案例侧弹窗 -->
-          <div>
-            <add-case
-              v-model:addcaseVisible="addcasevisible"
-              @changeData="updateTableData"
-              v-model:edit="edit"
-              v-model:projectId="projectId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:projectTaskId="projectTaskId"
-              v-model:EditCaseId="EditCaseId"
-            />
-          </div>
-          <!-- 添加案例侧弹窗 -->
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddHomework">
-              <img src="../../assets/images/leveladd/zuo.png" />
-            </div>
-            <div class="text">作业</div>
-          </div>
-          <!-- 添加作业侧弹窗 -->
-          <div>
-            <add-homework
-              v-model:addhomeworkVisible="addhomeworkvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditWorkId="EditWorkId"
-              v-model:routerTaskId="routerTaskId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img" @click="showDrawerAddTest">
-              <img src="../../assets/images/leveladd/kao.png" />
-            </div>
-            <div class="text">考试</div>
-          </div>
-          <!-- 添加考试侧弹窗 -->
-          <div>
-            <add-test
-              v-model:addtestVisible="addtestvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:EditTestId="EditTestId"
-              v-model:routerTaskId="routerTaskId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddLive">
-            <div class="img">
-              <img src="../../assets/images/leveladd/zhi.png" />
-            </div>
-            <div class="text">直播</div>
-          </div>
-          <div>
-            <add-live
-              v-model:addliveVisible="addlivevisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:edit="edit"
-              v-model:EditLiveId="EditLiveId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon" @click="showDrawerAddRef">
-            <div class="img">
-              <img src="../../assets/images/leveladd/wai.png" />
-            </div>
-            <div class="text">外链</div>
-          </div>
-          <div>
-            <add-ref
-              v-model:addrefVisible="addrefvisible"
-              :isLevel="isLevel"
-              @changeData="updateTableData"
-              v-model:isactive="isactive"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:edit="edit"
-              v-model:EditRefId="EditRefId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddDiscuss">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tao.png" />
-            </div>
-            <div class="text">讨论</div>
-          </div>
-          <div>
-            <add-discuss
-              v-model:adddiscussVisible="adddiscussvisible"
-              @changeData="updateTableData"
-              :isLevel="isLevel"
-              v-model:isactive="isactive"
-              v-model:edit="edit"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:EditDiscussId="EditDiscussId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddActive">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/huo.png" />
-            </div>
-            <div class="text">活动</div>
-          </div>
-          <div>
-            <add-active
-              v-model:addactiveVisible="addactivevisible"
-              :isLevel="isLevel"
-              v-model:edit="edit"
-              v-model:isactive="isactive"
-              @changeData="updateTableData"
-              v-model:routerId="routerId"
-              v-model:chooseStageId="chooseStageId"
-              v-model:routerTaskId="routerTaskId"
-              v-model:EditActiveId="EditActiveId"
-            />
-          </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddEval">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/ce.png" />
-            </div>
-            <div class="text">测评</div>
-            <!-- 添加测评侧弹窗 -->
+            <!-- 添加在线侧弹窗 -->
             <div>
-              <add-eval
-                v-model:addevalVisible="addevalvisible"
-                :isLevel="isLevel"
+              <add-online
+                v-model:addonlineVisible="addonlinevisible"
                 @changeData="updateTableData"
-                v-model:isactive="isactive"
                 v-model:edit="edit"
-                v-model:routerId="routerId"
-                v-model:EditEvalId="EditEvalId"
-                v-model:routerTaskId="routerTaskId"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditOnlineId="EditOnlineId"
               />
             </div>
-            <!-- 添加测评侧弹窗 -->
+            <!-- 添加在线侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddInvist">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/diao.png" />
+          <div class="item">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/mian.png" />
+              </div>
+              <div class="text">面授</div>
             </div>
-            <div class="text">评估</div>
-            <!-- 添加评估侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddCase()">
+              <div class="img">
+                <img src="../../assets/images/leveladd/an.png" />
+              </div>
+              <div class="text">案例</div>
+            </div>
+            <!-- 添加案例侧弹窗 -->
             <div>
-              <add-invist
-                v-model:addinvistVisible="addinvistvisible"
+              <add-case
+                v-model:addcaseVisible="addcasevisible"
+                @changeData="updateTableData"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:projectTaskId="projectTaskId"
+                v-model:EditCaseId="EditCaseId"
+              />
+            </div>
+            <!-- 添加案例侧弹窗 -->
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddHomework">
+                <img src="../../assets/images/leveladd/zuo.png" />
+              </div>
+              <div class="text">作业</div>
+            </div>
+            <!-- 添加作业侧弹窗 -->
+            <div>
+              <add-homework
+                v-model:addhomeworkVisible="addhomeworkvisible"
                 :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
                 v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId"
-                v-model:EditInvistId="EditInvistId"
+                v-model:EditWorkId="EditWorkId"
                 v-model:routerTaskId="routerTaskId"
               />
             </div>
-            <!-- 添加评估侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddVote">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/tou.png" />
+          <div class="item">
+            <div class="itcon">
+              <div class="img" @click="showDrawerAddTest">
+                <img src="../../assets/images/leveladd/kao.png" />
+              </div>
+              <div class="text">考试</div>
             </div>
-            <div class="text">投票</div>
-            <!-- 添加投票侧弹窗 -->
+            <!-- 添加考试侧弹窗 -->
             <div>
-              <add-vote
-                v-model:addvoteVisible="addvotevisible"
+              <add-test
+                v-model:addtestVisible="addtestvisible"
                 :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
                 v-model:routerId="routerId"
                 v-model:chooseStageId="chooseStageId"
-                v-model:EditVoteId="EditVoteId"
+                v-model:EditTestId="EditTestId"
                 v-model:routerTaskId="routerTaskId"
               />
             </div>
-            <!-- 添加投票侧弹窗 -->
+            <div class="lin"></div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item" @click="showDrawerAddProj">
-          <div class="itcon">
-            <div class="img">
-              <img
-                src="../../assets/images/leveladd/xiang.png"
-                @click="showDrawer"
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddLive">
+              <div class="img">
+                <img src="../../assets/images/leveladd/zhi.png" />
+              </div>
+              <div class="text">直播</div>
+            </div>
+            <div>
+              <add-live
+                v-model:addliveVisible="addlivevisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:edit="edit"
+                v-model:EditLiveId="EditLiveId"
               />
             </div>
-            <div class="text">项目</div>
+            <div class="lin"></div>
+          </div>
+          <div class="item">
+            <div class="itcon" @click="showDrawerAddRef">
+              <div class="img">
+                <img src="../../assets/images/leveladd/wai.png" />
+              </div>
+              <div class="text">外链</div>
+            </div>
+            <div>
+              <add-ref
+                v-model:addrefVisible="addrefvisible"
+                :isLevel="isLevel"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:edit="edit"
+                v-model:EditRefId="EditRefId"
+              />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddDiscuss">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tao.png" />
+              </div>
+              <div class="text">讨论</div>
+            </div>
+            <div>
+              <add-discuss
+                v-model:adddiscussVisible="adddiscussvisible"
+                @changeData="updateTableData"
+                :isLevel="isLevel"
+                v-model:isactive="isactive"
+                v-model:edit="edit"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:EditDiscussId="EditDiscussId"
+              />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddActive">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/huo.png" />
+              </div>
+              <div class="text">活动</div>
+            </div>
+            <div>
+              <add-active
+                v-model:addactiveVisible="addactivevisible"
+                :isLevel="isLevel"
+                v-model:edit="edit"
+                v-model:isactive="isactive"
+                @changeData="updateTableData"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:routerTaskId="routerTaskId"
+                v-model:EditActiveId="EditActiveId"
+              />
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddEval">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/ce.png" />
+              </div>
+              <div class="text">测评</div>
+              <!-- 添加测评侧弹窗 -->
+              <div>
+                <add-eval
+                  v-model:addevalVisible="addevalvisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:EditEvalId="EditEvalId"
+                  v-model:routerTaskId="routerTaskId"
+                />
+              </div>
+              <!-- 添加测评侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddInvist">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/diao.png" />
+              </div>
+              <div class="text">评估</div>
+              <!-- 添加评估侧弹窗 -->
+              <div>
+                <add-invist
+                  v-model:addinvistVisible="addinvistvisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditInvistId="EditInvistId"
+                  v-model:routerTaskId="routerTaskId"
+                />
+              </div>
+              <!-- 添加评估侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddVote">
+            <div class="itcon">
+              <div class="img">
+                <img src="../../assets/images/leveladd/tou.png" />
+              </div>
+              <div class="text">投票</div>
+              <!-- 添加投票侧弹窗 -->
+              <div>
+                <add-vote
+                  v-model:addvoteVisible="addvotevisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditVoteId="EditVoteId"
+                  v-model:routerTaskId="routerTaskId"
+                />
+              </div>
+              <!-- 添加投票侧弹窗 -->
+            </div>
+            <div class="lin"></div>
+          </div>
+          <div class="item" @click="showDrawerAddProj">
+            <div class="itcon">
+              <div class="img">
+                <img
+                  src="../../assets/images/leveladd/xiang.png"
+                  @click="showDrawer"
+                />
+              </div>
+              <div class="text">项目</div>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="boom">
-        <div class="boomcen">
-          <div class="title">
-            <div class="tit_left">
-              <span>任务列表</span>
-            </div>
-            <div class="tit_right">
-              <div class="btn btn1" @click="showChangeModal">
-                <div class="btnText">移动到任务阶段</div>
+        <div class="boom">
+          <div class="boomcen">
+            <div class="title">
+              <div class="tit_left">
+                <span>任务列表</span>
               </div>
-              <div class="btn btn2">
-                <div class="imgIcon"></div>
-                <div class="btnText" @click="showDeleteALLModal">批量删除</div>
+              <div class="tit_right">
+                <div class="btn btn1" @click="showChangeModal">
+                  <div class="btnText">移动到任务阶段</div>
+                </div>
+                <div class="btn btn2">
+                  <div class="imgIcon"></div>
+                  <div class="btnText" @click="showDeleteALLModal">
+                    批量删除
+                  </div>
+                </div>
               </div>
             </div>
-          </div>
-          <div class="tableBox">
-            <div
-              style="
-                height: 50px;
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                background-color: #eff4fc;
-                font-size: 14px;
-                font-weight: 400;
-                color: #999ba3;
-                line-height: 36px;
-                border-bottom: 1px solid #f2f6fc;
-              "
-            >
+            <div class="tableBox">
               <div
                 style="
-                  width: 87px;
-                  text-align: center;
+                  height: 50px;
                   display: flex;
-                  margin-left: 46px;
+                  justify-content: space-between;
+                  align-items: center;
+                  background-color: #eff4fc;
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #999ba3;
+                  line-height: 36px;
+                  border-bottom: 1px solid #f2f6fc;
                 "
               >
-                <img
+                <div
                   style="
-                    width: 16px;
-                    height: 16px;
-                    cursor: pointer;
-                    margin-top: 12px;
+                    width: 87px;
+                    text-align: center;
+                    display: flex;
+                    margin-left: 46px;
                   "
-                  :src="
-                    selectAll === 0
-                      ? require('../../assets/images/notSelect.png')
-                      : selectAll === 1
-                      ? require('../../assets/images/selectAll.png')
-                      : require('../../assets/images/select.png')
-                  "
-                  @click="selectRowAll"
-                />
-                <!-- <a-checkbox
+                >
+                  <img
+                    style="
+                      width: 16px;
+                      height: 16px;
+                      cursor: pointer;
+                      margin-top: 12px;
+                    "
+                    :src="
+                      selectAll === 0
+                        ? require('../../assets/images/notSelect.png')
+                        : selectAll === 1
+                        ? require('../../assets/images/selectAll.png')
+                        : require('../../assets/images/select.png')
+                    "
+                    @click="selectRowAll"
+                  />
+                  <!-- <a-checkbox
                     v-model:checked="selectAll"
                     @change="selectRowAll"
                   >
                   </a-checkbox> -->
-                <div style="margin-top: 2px; margin-left: 8px">类型</div>
-              </div>
-              <div style="width: 120px; text-align: center">任务名称</div>
-              <div style="width: 120px; text-align: center">必修/选修</div>
-              <div style="width: 87px; text-align: center">时长</div>
-              <div style="width: 120px; text-align: center; margin-right: 20px">
-                操作
-              </div>
-            </div>
-            <draggable
-              v-model="tableData"
-              chosenClass="chosen"
-              ghostClass="ghost"
-              forceFallback="true"
-              group="task"
-              animation="500"
-              @start="onStart"
-              @end="onEnd"
-            >
-              <template #item="{ element }">
+                  <div style="margin-top: 2px; margin-left: 8px">类型</div>
+                </div>
+                <div style="width: 120px; text-align: center">任务名称</div>
+                <div style="width: 120px; text-align: center">必修/选修</div>
+                <div style="width: 87px; text-align: center">时长</div>
                 <div
-                  style="
-                    height: 50px;
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
-                    border-bottom: 1px solid #f2f6fc;
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #4f5156;
-                    line-height: 36px;
-                  "
-                  class="tableRow"
+                  style="width: 120px; text-align: center; margin-right: 20px"
                 >
+                  操作
+                </div>
+              </div>
+              <draggable
+                v-model="tableData"
+                chosenClass="chosen"
+                ghostClass="ghost"
+                forceFallback="true"
+                group="task"
+                animation="500"
+                @start="onStart"
+                @end="onEnd"
+              >
+                <template #item="{ element }">
                   <div
                     style="
-                      width: 87px;
-                      text-align: center;
-                      margin-left: 46px;
-                      position: relative;
+                      height: 50px;
+                      display: flex;
+                      justify-content: space-between;
+                      align-items: center;
+                      border-bottom: 1px solid #f2f6fc;
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4f5156;
+                      line-height: 36px;
                     "
+                    class="tableRow"
                   >
-                    <div class="racona">
-                      <div
-                        class="img"
-                        style="
-                          cursor: pointer;
-                          margin-top: 2px;
-                          margin-right: 9px;
-                          position: absolute;
-                          left: -25px;
-                        "
-                      ></div>
-                      <a-checkbox
-                        :id="element.id"
-                        v-model:checked="element.checked"
-                        @change="changeRow"
-                      >
-                      </a-checkbox>
-                      <div style="margin-top: 2px; margin-left: 8px">
-                        {{ element.lei }}
+                    <div
+                      style="
+                        width: 87px;
+                        text-align: center;
+                        margin-left: 46px;
+                        position: relative;
+                      "
+                    >
+                      <div class="racona">
+                        <div
+                          class="img"
+                          style="
+                            cursor: pointer;
+                            margin-top: 2px;
+                            margin-right: 9px;
+                            position: absolute;
+                            left: -25px;
+                          "
+                        ></div>
+                        <a-checkbox
+                          :id="element.id"
+                          v-model:checked="element.checked"
+                          @change="changeRow"
+                        >
+                        </a-checkbox>
+                        <div style="margin-top: 2px; margin-left: 8px">
+                          {{ element.lei }}
+                        </div>
                       </div>
                     </div>
-                  </div>
-                  <div style="width: 120px; text-align: center">
-                    {{ element.creater }}
-                  </div>
-                  <div style="width: 120px; text-align: center">
-                    <div class="opat">
-                      <div class="opacationt clearfix">
-                        <a-switch
-                          style="margin-left: -50px; margin-top: 3px"
-                          v-model:checked="element.checked1"
-                          size="small"
-                          active-color="red"
-                          @click="changeCourseType(element)"
-                        />
-                        <div class="showt clearfix">
-                          <div
-                            class="bi"
-                            :style="{
-                              'z-index': element.checked1 ? 999 : 998,
-                            }"
-                          >
-                            必修
+                    <div style="width: 120px; text-align: center">
+                      {{ element.creater }}
+                    </div>
+                    <div style="width: 120px; text-align: center">
+                      <div class="opat">
+                        <div class="opacationt clearfix">
+                          <a-switch
+                            style="margin-left: -50px; margin-top: 3px"
+                            v-model:checked="element.checked1"
+                            size="small"
+                            active-color="red"
+                            @click="changeCourseType(element)"
+                          />
+                          <div class="showt clearfix">
+                            <div
+                              class="bi"
+                              :style="{
+                                'z-index': element.checked1 ? 999 : 998,
+                              }"
+                            >
+                              必修
+                            </div>
+                            <div class="xuan">选修</div>
                           </div>
-                          <div class="xuan">选修</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="width: 87px; text-align: center">
+                      {{ element.cretime }}分钟
+                    </div>
+                    <div
+                      style="
+                        width: 120px;
+                        text-align: center;
+                        margin-right: 20px;
+                      "
+                    >
+                      <div class="opa">
+                        <div class="opacation">
+                          <span
+                            style="
+                              color: #4ea6ff;
+                              margin-right: 25px;
+                              cursor: pointer;
+                            "
+                            @click="
+                              decideType(
+                                element.lei,
+                                element.courseId,
+                                element.id
+                              )
+                            "
+                          >
+                            编辑
+                          </span>
+                          <span
+                            style="color: #4ea6ff; cursor: pointer"
+                            @click="showDeleteModal(element.id)"
+                          >
+                            删除
+                          </span>
                         </div>
                       </div>
                     </div>
                   </div>
-                  <div style="width: 87px; text-align: center">
-                    {{ element.cretime }}分钟
+                </template>
+              </draggable>
+            </div>
+            <!-- 无数据样式 -->
+            <div
+              class="notable"
+              :style="{ display: stm_hs ? 'block' : 'none' }"
+            >
+              <div class="notablebox">
+                <div class="boxbody">
+                  <div class="boximg"></div>
+                  <div class="boxtitle">
+                    <span style="color: #ffb64e; font-size: 20px">无任务</span>
                   </div>
-                  <div
-                    style="width: 120px; text-align: center; margin-right: 20px"
-                  >
-                    <div class="opa">
-                      <div class="opacation">
-                        <span
-                          style="
-                            color: #4ea6ff;
-                            margin-right: 25px;
-                            cursor: pointer;
-                          "
-                          @click="
-                            decideType(
-                              element.lei,
-                              element.courseId,
-                              element.id
-                            )
-                          "
-                        >
-                          编辑
-                        </span>
-                        <span
-                          style="color: #4ea6ff; cursor: pointer"
-                          @click="showDeleteModal(element.id)"
-                        >
-                          删除
-                        </span>
-                      </div>
-                    </div>
+                  <div class="boxtitle2">
+                    <span style="color: #878b92">请点击上方，创建任务</span>
                   </div>
                 </div>
-              </template>
-            </draggable>
-          </div>
-          <!-- 无数据样式 -->
-          <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
-            <div class="notablebox">
-              <div class="boxbody">
-                <div class="boximg"></div>
-                <div class="boxtitle">
-                  <span style="color: #ffb64e; font-size: 20px">无任务</span>
-                </div>
-                <div class="boxtitle2">
-                  <span style="color: #878b92">请点击上方，创建任务</span>
-                </div>
-              </div>
-              <div class="smallleft"></div>
-              <div class="smallright"></div>
-            </div>
-          </div>
-          <!-- 无数据样式 -->
-        </div>
-      </div>
-    
-      <div class="draw" style="position: relative">
-        <a-drawer
-          v-model:visible="addprojvisible"
-          class="drawerStyle ProjectDrawer"
-          title="关联项目"
-          placement="right"
-          width="80%"
-          @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="leaveProjDrawer"
-              />
-            </div>
-            <div class="drawerbox">
-              <a-table
-                :columns="drawertableColumns()"
-                :data-source="drawertableData"
-                :loading="tableDataTotal === -1 ? true : false"
-                :scroll="{ x: 700 }"
-                @expand="expandTable"
-                :pagination="false"
-              >
-              </a-table>
-            </div>
-            <div class="btnn">
-              <button @click="leaveProjDrawer" class="btn1">取消</button>
-              <button @click="updateTask" class="btn2">确定</button>
-            </div>
-          </div>
-        </a-drawer>
-      </div>
-    </div>
-    <div class="right" :style="{ display: gqxy_hs ? 'none' : 'block' }">
-      <div class="addhead">
-        <div class="filt">
-          <div class="le">
-            <div class="leftimg">
-              <img class="img" src="../../assets/px.jpg" />
-            </div>
-            <div class="imgfor">
-              <div class="forz">产品经理进阶路径</div>
-              <div class="fort">创建时间：2022-07-21 00:00</div>
-            </div>
-          </div>
-          <div class="rightt">
-            <div class="select">
-              <span>学习模式：</span>
-              <div class="inputbox">
-                <input type="text" placeholder="按学习时间解锁" />
-                <div class="bottonbox"><div class="btnText">切换模式</div></div>
+                <div class="smallleft"></div>
+                <div class="smallright"></div>
               </div>
             </div>
-            <div class="line"></div>
-            <router-link to="/leveladd">
-              <div style="display: flex">
-                <img class="img2" src="../../assets/images/leveladd/back.png" />
-                <div class="return">返回</div>
-              </div>
-            </router-link>
+            <!-- 无数据样式 -->
           </div>
         </div>
-      </div>
-      <div class="boom">
-        <div class="boomcen">
-          <div class="xwid">
-            <div class="xin">
-              <div class="xheadb">
-                <button class="addx" @click="showAddStu">添加学员</button>
-                <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
-                <button class="addd" @click="showImpStu">导入学员</button>
-                <button class="addd" @click="showDeleteALLModal">
-                  批量删除
-                </button>
+
+        <div class="draw" style="position: relative">
+          <a-drawer
+            v-model:visible="addprojvisible"
+            class="drawerStyle ProjectDrawer"
+            title="关联项目"
+            placement="right"
+            width="80%"
+            @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="leaveProjDrawer"
+                />
               </div>
-              <!-- <div class="talk">
+              <div class="drawerbox">
+                <a-table
+                  :columns="drawertableColumns()"
+                  :data-source="drawertableData"
+                  :loading="tableDataTotal === -1 ? true : false"
+                  :scroll="{ x: 700 }"
+                  @expand="expandTable"
+                  :pagination="false"
+                >
+                </a-table>
+              </div>
+              <div class="btnn">
+                <button @click="leaveProjDrawer" class="btn1">取消</button>
+                <button @click="updateTask" class="btn2">确定</button>
+              </div>
+            </div>
+          </a-drawer>
+        </div>
+      </div>
+      <div class="right" :style="{ display: gqxy_hs ? 'none' : 'block' }">
+        <div class="addhead">
+          <div class="filt">
+            <div class="le">
+              <div class="leftimg">
+                <img class="img" src="../../assets/px.jpg" />
+              </div>
+              <div class="imgfor">
+                <div class="forz">产品经理进阶路径</div>
+                <div class="fort">创建时间：2022-07-21 00:00</div>
+              </div>
+            </div>
+            <div class="rightt">
+              <div class="select">
+                <span>学习模式：</span>
+                <div class="inputbox">
+                  <input type="text" placeholder="按学习时间解锁" />
+                  <div class="bottonbox" @click="showModeVisible">
+                    <div class="btnText">切换模式</div>
+                  </div>
+                </div>
+                <!-- 切换模式抽屉 -->
+                <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
+              </div>
+              <div class="line"></div>
+              <router-link to="/leveladd">
+                <div style="display: flex">
+                  <img
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
+                  />
+                  <div class="return">返回</div>
+                </div>
+              </router-link>
+            </div>
+          </div>
+        </div>
+        <div class="boom">
+          <div class="boomcen">
+            <div class="xwid">
+              <div class="xin">
+                <div class="xheadb">
+                  <button class="addx" @click="showAddStu">添加学员</button>
+                  <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
+                  <button class="addd" @click="showImpStu">导入学员</button>
+                  <button class="addd" @click="showDeleteALLModal">
+                    批量删除
+                  </button>
+                </div>
+                <!-- <div class="talk">
                 <img class="im" src="../../assets/images/leveladd/gan.png" />
                 <div class="xu">
                   <span class="yi">已选择</span>
@@ -770,22 +795,22 @@
                   <span class="yi">条</span>
                 </div>
               </div> -->
-              <div class="tablebox1" style="margin-top: 20px">
-                <a-table
-                  style="border: 1px solid #f2f6fe"
-                  :columns="tableDataFunc2()"
-                  :data-source="tableData2"
-                  :loading="tableDataTotal === -1 ? true : false"
-                  expandRowByClick="true"
-                  @expand="expandTable"
-                  :pagination="false"
-                  :row-selection="{
-                    columnWidth: 30,
-                    selectedRowKeys: selectedRowKeys,
-                    onChange: onSelectChange,
-                  }"
-                />
-                <!-- <div class="pa">
+                <div class="tablebox1" style="margin-top: 20px">
+                  <a-table
+                    style="border: 1px solid #f2f6fe"
+                    :columns="tableDataFunc2()"
+                    :data-source="tableData2"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    @expand="expandTable"
+                    :pagination="false"
+                    :row-selection="{
+                      columnWidth: 30,
+                      selectedRowKeys: selectedRowKeys,
+                      onChange: onSelectChange,
+                    }"
+                  />
+                  <!-- <div class="pa">
                   <a-pagination
                     showSizeChanger="true"
                     showQuickJumper="true"
@@ -796,64 +821,62 @@
                     class="pagination"
                   />
                 </div> -->
-                <!-- 无数据样式 -->
-                <div
-                  class="notable"
-                  :style="{ display: stm_hs ? 'block' : 'none' }"
-                >
-                  <div class="notablebox">
-                    <div class="boxbody">
-                      <div class="boximg"></div>
-                      <div class="boxtitle">
-                        <span style="color: #ffb64e; font-size: 20px"
-                          >无学员</span
-                        >
-                      </div>
-                      <div class="boxtitle2">
-                        <span style="color: #878b92">请添加学员或导入学员</span>
+                  <!-- 无数据样式 -->
+                  <div
+                    class="notable"
+                    :style="{ display: stm_hs ? 'block' : 'none' }"
+                  >
+                    <div class="notablebox">
+                      <div class="boxbody">
+                        <div class="boximg"></div>
+                        <div class="boxtitle">
+                          <span style="color: #ffb64e; font-size: 20px"
+                            >无学员</span
+                          >
+                        </div>
+                        <div class="boxtitle2">
+                          <span style="color: #878b92"
+                            >请添加学员或导入学员</span
+                          >
+                        </div>
                       </div>
+                      <div class="smallleft"></div>
+                      <div class="smallright"></div>
                     </div>
-                    <div class="smallleft"></div>
-                    <div class="smallright"></div>
                   </div>
+                  <!-- 无数据样式 -->
                 </div>
-                <!-- 无数据样式 -->
               </div>
+              <div class="pad"></div>
             </div>
-            <div class="pad"></div>
           </div>
         </div>
-      </div>
-      <div class="footbtn">
-        <div class="btnbox">
-          <div class="btn btn1" @click="gqxy_hShow">
-            <div class="btnText">上一步</div>
-          </div>
-          <div class="btn btn2">
-            <div class="btnText">保存</div>
+        <div class="footbtn">
+          <div class="btnbox">
+            <div class="btn btn1" @click="gqxy_hShow">
+              <div class="btnText">上一步</div>
+            </div>
+            <div class="btn btn2">
+              <div class="btnText">保存</div>
+            </div>
           </div>
         </div>
       </div>
     </div>
- </div>
 
-
-
-
-
-      <div class="footbtn">
-        <div class="btnbox">
-          <div class="btn btn2">
-            <div class="btnText">暂存</div>
-          </div>
-          <div class="btn btn2">
-            <div class="btnText">确定</div>
-          </div>
-          <div class="btn btn1">
-            <div class="btnText">取消</div>
-          </div>
+    <div class="footbtn">
+      <div class="btnbox">
+        <div class="btn btn2">
+          <div class="btnText">暂存</div>
+        </div>
+        <div class="btn btn2">
+          <div class="btnText">确定</div>
+        </div>
+        <div class="btn btn1">
+          <div class="btnText">取消</div>
         </div>
       </div>
+    </div>
     <!-- 添加学员抽屉 -->
     <add-stu v-model:AddSvisible="AddSvisible" />
     <!-- 导入学员抽屉 -->
@@ -969,11 +992,11 @@
             </div>
           </div>
         </div>
-      </div></a-modal
-    >
+      </div>
+    </a-modal>
 
-     <!-- 是否删除关卡弹窗 -->
-        <a-modal
+    <!-- 是否删除关卡弹窗 -->
+    <a-modal
       v-model:visible="deleteChapterModal"
       :footer="null"
       :closable="cC"
@@ -993,10 +1016,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteChapter">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteChapter">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -1030,6 +1053,7 @@ import * as apiProj from "../../api/index.js";
 import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import { toDate } from "../../api/method";
+import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -1047,6 +1071,7 @@ export default {
     AddLive,
     AddRef,
     draggable,
+    UnlockMode,
   },
   setup() {
     const state = reactive({
@@ -1308,12 +1333,14 @@ export default {
       chooseStageId: null,
       chooseChapterId: null,
 
-       updateChapterID: null, //编辑关卡id
-      deleteChapterModal:false,//删除关卡弹窗
-      deleteChapterId:null,//删除关卡id
+      updateChapterID: null, //编辑关卡id
+      deleteChapterModal: false, //删除关卡弹窗
+      deleteChapterId: null, //删除关卡id
+
+      unlockModeVisible: false, //切换模式抽屉
     });
 
-     const showModal = (element) => {
+    const showModal = (element) => {
       state.modal = true;
       console.log("element", element);
       if (element) {
@@ -1333,12 +1360,12 @@ export default {
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
       if (state.updateChapterID) {
-         let obj = {
-        name: state.value1,
-        remark: state.value2,
-        routerId: state.routerId,
-        chapterId:state.updateChapterID
-      };
+        let obj = {
+          name: state.value1,
+          remark: state.value2,
+          routerId: state.routerId,
+          chapterId: state.updateChapterID,
+        };
         api
           .updateChapter(obj)
           .then((res) => {
@@ -1351,11 +1378,11 @@ export default {
             console.log("修改失败", err);
           });
       } else {
-         let obj = {
-        name: state.value1,
-        remark: state.value2,
-        routerId: state.routerId,
-      };
+        let obj = {
+          name: state.value1,
+          remark: state.value2,
+          routerId: state.routerId,
+        };
         api
           .editChapter(obj)
           .then((res) => {
@@ -1379,17 +1406,17 @@ export default {
           });
       }
     };
-//打开删除关卡弹窗
-const showDeleteChapter=(id)=>{
-state.deleteChapterId=id
- state.deleteChapterModal=true
-}
-//关闭删除关卡弹窗
-const closeDeleteChapter=()=>{
-  state.deleteChapterId=null
-  state.deleteChapterModal=false
-}
- //删除关卡
+    //打开删除关卡弹窗
+    const showDeleteChapter = (id) => {
+      state.deleteChapterId = id;
+      state.deleteChapterModal = true;
+    };
+    //关闭删除关卡弹窗
+    const closeDeleteChapter = () => {
+      state.deleteChapterId = null;
+      state.deleteChapterModal = false;
+    };
+    //删除关卡
     const deleteChapter = () => {
       console.log("chapterId", state.deleteChapterId);
       let obj = {
@@ -1399,15 +1426,15 @@ const closeDeleteChapter=()=>{
         .deleteChapter(obj)
         .then((res) => {
           console.log("删除关卡成功", res);
-          message.success('删除关卡成功')
-          closeDeleteChapter()
+          message.success("删除关卡成功");
+          closeDeleteChapter();
           getDetail();
         })
         .catch((err) => {
           console.log("删除关卡失败", err);
         });
     };
-   
+
     const showDrawer = () => {
       state.visible = true;
     };
@@ -1536,8 +1563,8 @@ const closeDeleteChapter=()=>{
           if (state.level.length > 0) {
             let chapter = localStorage.getItem("chapterId");
             if (chapter !== null) {
-              dataAssignment(chapter);//用哪个的任务表
-              state.isactive = chapter;//哪个亮
+              dataAssignment(chapter); //用哪个的任务表
+              state.isactive = chapter; //哪个亮
             } else {
               dataAssignment(state.level[0].chapterId);
               state.isactive = state.level[0].chapterId;
@@ -1552,8 +1579,7 @@ const closeDeleteChapter=()=>{
     const closeDrawer = () => {
       state.visible = false;
     };
-   
-  
+
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
@@ -1930,7 +1956,7 @@ const closeDeleteChapter=()=>{
         showDrawerAddCase(id, eleId);
       }
     };
- 
+
     const changeCourseType = (ele) => {
       console.log("任务id", ele.id);
       console.log("flag", ele.checked1);
@@ -2007,14 +2033,14 @@ const closeDeleteChapter=()=>{
     const getAllProjText = () => {
       apiProj
         .getProjectList({
-          "beginTime": 0,
-          "createName": "",
-          "endTime": 0,
-          "manager": "",
-          "name": "",
-          "pageNo": 0,
-          "pageSize": 0,
-          "status": 0
+          beginTime: 0,
+          createName: "",
+          endTime: 0,
+          manager: "",
+          name: "",
+          pageNo: 0,
+          pageSize: 0,
+          status: 0,
         })
         .then((res) => {
           let arr = res.data.data.rows;
@@ -2025,7 +2051,7 @@ const closeDeleteChapter=()=>{
         })
         .catch((err) => {
           console.log("获取全部项目信息接口失败", err);
-          console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
+          console.log("+++++++++++++++++++++++++++++++++++++++++++++++");
           // state.createLoading = false;
         });
     };
@@ -2049,6 +2075,11 @@ const closeDeleteChapter=()=>{
           console.log(err, 1111);
         });
     };
+
+    //显示切换模式抽屉
+    const showModeVisible = () => {
+      state.unlockModeVisible = true;
+    };
     onMounted(() => {
       // createCase();
       getAllProjText();
@@ -2106,10 +2137,11 @@ const closeDeleteChapter=()=>{
       getAllProjText,
       updateTask,
 
-
       showDeleteChapter,
       closeDeleteChapter,
       deleteChapter,
+
+      showModeVisible,
     };
   },
 };
@@ -3330,7 +3362,7 @@ const closeDeleteChapter=()=>{
       margin-left: 10px;
     }
   }
-    .footbtn {
+  .footbtn {
     width: 100%;
     height: 80px;
     margin-top: 16px;
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index a3d759ad..ec3bd787 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -169,7 +169,34 @@
           </div>
 
           <div class="in select">
-            <a-select
+            <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              style="width: 100%"
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+              placeholder="自动带出 可修改"
+              allow-clear
+              tree-default-expand-all
+              :tree-data="classifyList2"
+              :fieldNames="{
+                children: 'children',
+                label: 'name',
+                value: 'id',
+              }"
+              :disabled="viewDetail ? true : false"
+              @change="classificationChange2"
+              dropdownClassName="treeDropdown"
+            >
+              <!-- <template #title="{ value: val, title }">
+      <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
+      <template v-else>{{ title }}</template>
+    </template> -->
+            </a-tree-select>
+            <!-- <a-select
               :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
@@ -179,8 +206,9 @@
               placeholder="自动带出 可修改"
               :options="classifyList2"
               @change="classificationChange2"
+              :field-names="{ label: 'name', value: 'id', options: 'children' }"
               :disabled="viewDetail ? true : false"
-            />
+            /> -->
           </div>
         </div>
         <div class="name name2">
@@ -359,22 +387,24 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, onUnmounted } from "vue";
+import { reactive, toRefs, ref, onUnmounted, computed } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
+// import * as api1 from "../../api/index1";
 import { storage } from "../../api/storage";
 import { toDate } from "../../api/method";
-
+import { useStore } from "vuex";
 export default {
   name: "projectAdd",
   setup() {
+    const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const isEdit = ref(false);
     let peojectID = "";
-
+    console.log("store.state.orgtreeList", store.state.orgtreeList);
     if (routers.query.projectId) {
       storage.set("projectAddId", routers.query.projectId);
       isEdit.value = true;
@@ -515,7 +545,7 @@ export default {
       valueE1: null,
       valueE2: null,
       classifySelect1: [],
-      classifySelect2: [],
+      classifySelect2: null,
       classifySelect3: [],
       classifySelect4: [],
       rangevalue: [],
@@ -690,11 +720,25 @@ export default {
     };
 
     // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = ref([
-      { value: 1, label: "项目一" },
-      { value: 2, label: "项目二" },
-      { value: 3, label: "项目三" },
-    ]);
+    const classifyList2 = computed(() => {
+      return store.state.orgtreeList ? store.state.orgtreeList : ref(null);
+    });
+
+    // //获取资源归属
+    // const orgTree = () => {
+    //   api1
+    //     .orgtree()
+    //     .then((res) => {
+    //       console.log("获取集团组织成功", res);
+    //       if (res.status === 200) {
+    //         classifyList2.value = res.data.data;
+    //       }
+    //     })
+    //     .catch((err) => {
+    //       console.log("获取集团组织失败", err);
+    //     });
+    // };
+    // orgTree();
 
     let sourceBelongIdC = "";
     const classificationChange2 = (key) => {
@@ -1357,4 +1401,18 @@ export default {
     }
   }
 }
+.treeDropdown {
+  // 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;
+  }
+}
 </style>
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 69386b2f..950929d5 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -968,7 +968,9 @@
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">项目信息</div>
-            <div class="messagege">当前项目共0个阶段，0个任务</div>
+            <div class="messagege">
+              当前项目共{{ projectStages }}个阶段，{{ projectTasks }}个任务
+            </div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
@@ -1024,8 +1026,8 @@
         </div>
       </div>
     </a-modal>
-<!-- 创建项目提示框 -->
- <a-modal
+    <!-- 创建项目提示框 -->
+    <a-modal
       v-model:visible="reminderModal"
       :footer="null"
       :closable="closeBack"
@@ -1041,7 +1043,9 @@
             <div class="close_exit" @click="closeReminderModal"></div>
           </div>
           <div class="body">
-            <div style="margin-left:60px;margin-right:60px">请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同</div>
+            <div style="margin-left: 60px; margin-right: 60px">
+              请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同
+            </div>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn2" @click="okReminderModal">
@@ -1052,7 +1056,6 @@
       </div>
     </a-modal>
 
-
     <!-- 归属权抽屉 -->
     <proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
     <!-- 授权名单抽屉 -->
@@ -1061,9 +1064,6 @@
     <proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
     <!-- 管理权抽屉 -->
     <proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
-
-
-
   </div>
 </template>
 <script>
@@ -1101,7 +1101,7 @@ export default {
       projectPub: false, //发布弹窗
       backModal: false, //撤回弹窗
       closeBack: false, //撤回弹窗关闭图标
-      reminderModal:false,//温馨提示弹窗
+      reminderModal: false, //温馨提示弹窗
       ProjOwnervisible: false,
       ProjPvisible: false,
       ProjCheckvisible: false,
@@ -1118,7 +1118,9 @@ export default {
       tableDataTotal: -1, //学习路径列表总数
       pageSize: 10, //每页10条数据
 
-      projectStudentsNum: 0, //发布弹窗-学员人数
+      projectStudentsNum: 0, //发布弹窗-学员人
+      projectStages: 0,
+      projectTasks: 0,
       releaseProjectId: null, //发布的项目id
       releaseProjectName: null, //发布的项目名称
       releaseProjectTime: null, //发布的项目时间
@@ -1800,26 +1802,39 @@ export default {
       state.releaseProjectName = object.name;
       state.releaseProjectTime = object.time;
       console.log("object", object);
-      //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        projectId: object.projectId,
-      };
       api
-        .projectStudent(obj)
+        .getProjectCount(object.projectId)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("res", res.data);
-            state.projectStudentsNum = res.data.data.total
-              ? res.data.data.total
-              : 0;
+            console.log("获取关卡、任务、学员统计数据", res.data);
+            state.projectStudentsNum = res.data.students;
+            state.projectStages = res.data.stages;
+            state.projectTasks = res.data.tasks;
           }
         })
         .catch((err) => {
-          console.log("获取学员人数失败", err);
+          console.log("err", err);
         });
-      //获取阶段及任务总数
+      // //获取学员总数
+      // let obj = {
+      //   pageNo: 0,
+      //   pageSize: 0,
+      //   projectId: object.projectId,
+      // };
+      // api
+      //   .projectStudent(obj)
+      //   .then((res) => {
+      //     if (res.status === 200) {
+      //       // console.log("res", res.data);
+      //       state.projectStudentsNum = res.data.data.total
+      //         ? res.data.data.total
+      //         : 0;
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log("获取学员人数失败", err);
+      //   });
+      // //获取阶段及任务总数
     };
     //确认发布项目
     const releaseProject = () => {
@@ -3071,8 +3086,7 @@ export default {
     };
 
     const showModal1 = () => {
-     
-     state.reminderModal=true
+      state.reminderModal = true;
     };
     const closeModal1 = () => {
       state.estabish = false;
@@ -3101,14 +3115,13 @@ export default {
       state.ProjManagevisible = true;
     };
 
-const closeReminderModal=()=>{
-  state.reminderModal=false
-   
-}
-const okReminderModal=()=>{
-  state.reminderModal=false
-  state.estabish = true;
-}
+    const closeReminderModal = () => {
+      state.reminderModal = false;
+    };
+    const okReminderModal = () => {
+      state.reminderModal = false;
+      state.estabish = true;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index f3ca1cc7..b1172c7f 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -138,11 +138,11 @@
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
                   <!-- v-model:unlockModeVisible="unlockModeVisible" -->
-                  <div class="bottonbox"  @click="showModeVisible">
+                  <div class="bottonbox" @click="showModeVisible">
                     <div class="btnText">切换模式</div>
                   </div>
-                   <!-- 切换模式抽屉 -->
-    <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
+                  <!-- 切换模式抽屉 -->
+                  <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
                 </div>
               </div>
               <div class="line"></div>
@@ -992,9 +992,8 @@
       </div></a-modal
     >
 
-
-      <!-- 是否删除阶段弹窗 -->
-        <a-modal
+    <!-- 是否删除阶段弹窗 -->
+    <a-modal
       v-model:visible="deleteStageModal"
       :footer="null"
       :closable="cC"
@@ -1014,18 +1013,15 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteStage">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
       </div>
     </a-modal>
-
-
-   
   </div>
 </template>
 
@@ -1050,7 +1046,7 @@ import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-import UnlockMode from '../../components/drawers/UnlockMode.vue'
+import UnlockMode from "../../components/drawers/UnlockMode.vue";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -1296,10 +1292,10 @@ export default {
       selectAll: 0, //0：未选择，1：全选，2：部分选择
 
       updateStageID: null, //编辑阶段id
-      deleteStageId:null,//删除阶段的id
-      deleteStageModal:false,//删除阶段弹窗
+      deleteStageId: null, //删除阶段的id
+      deleteStageModal: false, //删除阶段弹窗
 
-unlockModeVisible:false,//切换模式抽屉
+      unlockModeVisible: false, //切换模式抽屉
     });
     console.log("projectId", state.projectId);
     const selectProjectName = (value, index) => {
@@ -1728,7 +1724,7 @@ unlockModeVisible:false,//切换模式抽屉
             console.log("修改阶段成功", res);
             state.valuesname = "";
             state.valuesnotice = "";
-           closeModal()
+            closeModal();
             state.updateStageID = null;
             message.destroy();
             message.success("修改阶段成功");
@@ -1747,9 +1743,9 @@ unlockModeVisible:false,//切换模式抽屉
           .editStage(obj)
           .then((res) => {
             console.log("添加阶段成功", res);
-            state.valuesname = ""
-              state.valuesnotice = ""
-             closeModal()
+            state.valuesname = "";
+            state.valuesnotice = "";
+            closeModal();
             message.destroy();
             message.success("添加阶段成功");
             getTask();
@@ -1760,19 +1756,17 @@ unlockModeVisible:false,//切换模式抽屉
       }
     };
 
-
-//打开删除阶段弹窗
-const showDeleteStage=(id)=>{
-
-state.deleteStageId=id
- state.deleteStageModal=true
-}
-//关闭删除阶段弹窗
-const closeDeleteStage=()=>{
-  state.deleteStageId=null
-  state.deleteStageModal=false
-}
- //删除阶段
+    //打开删除阶段弹窗
+    const showDeleteStage = (id) => {
+      state.deleteStageId = id;
+      state.deleteStageModal = true;
+    };
+    //关闭删除阶段弹窗
+    const closeDeleteStage = () => {
+      state.deleteStageId = null;
+      state.deleteStageModal = false;
+    };
+    //删除阶段
     const deleteStage = () => {
       console.log("chapterId", state.deleteStageId);
       let obj = {
@@ -1782,8 +1776,8 @@ const closeDeleteStage=()=>{
         .deleteStage(obj)
         .then((res) => {
           console.log("删除阶段成功", res);
-          message.success('删除阶段成功')
-          closeDeleteStage()
+          message.success("删除阶段成功");
+          closeDeleteStage();
           getTask();
         })
         .catch((err) => {
@@ -2032,9 +2026,9 @@ const closeDeleteStage=()=>{
     };
 
     //显示切换模式抽屉
-    const showModeVisible=()=>{
-state.unlockModeVisible=true
-    }
+    const showModeVisible = () => {
+      state.unlockModeVisible = true;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 8f1b3d76..347c9d8b 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -77,12 +77,12 @@
         </div>
       </template>
     </draggable>
-    <div id="qrcode" style="display:flex;flex-direction: column;">
+    <div id="qrcode" style="display: flex; flex-direction: column">
       <div>下载二维码</div>
       <qrcode-vue
         :value="qrcodeUrl"
         :size="qrcodeSize"
-        style="width: 200px;height: 200px"
+        style="width: 200px; height: 200px"
       ></qrcode-vue>
     </div>
     <div @click="downloadQr(200)">下载200</div>
@@ -90,11 +90,30 @@
     <div @click="downloadQr(800)">下载800</div>
   </div>
 
-<div @click="changeCodevisible">显示二维码弹窗</div>
-  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0" type="课程二维码"/>
+  <div @click="changeCodevisible">显示二维码弹窗</div>
+  <two-dimensional-code
+    v-model:codevisible="codevisible"
+    :codeInfo="codeInfo"
+    index="0"
+    type="课程二维码"
+  />
 
   <div @click="changeCodevisible2">显示二维码弹窗22</div>
-  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1" type="签到二维码"/>
+  <two-dimensional-code
+    v-model:codevisible="codevisible2"
+    :codeInfo="codeInfo2"
+    index="1"
+    type="签到二维码"
+  />
+
+  <a-table
+    :columns="columns"
+    :data-source="data"
+    :row-selection="{
+      selectedRowKeys: selectedRowKeys,
+      onChange: onSelectChange,
+    }"
+  />
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -112,7 +131,7 @@ import draggable from "vuedraggable";
 import QrcodeVue from "qrcode.vue";
 import html2canvas from "html2canvas";
 
-import TwoDimensionalCode from '../../components/TwoDimensionalCode.vue'
+import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
   name: "SystemManage",
   components: {
@@ -121,8 +140,9 @@ export default {
     // PlusOutlined,
     draggable,
     QrcodeVue,
-    TwoDimensionalCode
+    TwoDimensionalCode,
   },
+
   setup() {
     const state = reactive({
       visible: false,
@@ -157,14 +177,79 @@ export default {
           name: "拖拽六",
         },
       ],
-      
-      qrcodeUrl: "https://www.baidu.com/",
-      qrcodeSize:800,
 
-      codevisible:false,
-      codeInfo:{},
-      codevisible2:false,
-      codeInfo2:{}
+      qrcodeUrl: "https://www.baidu.com/",
+      qrcodeSize: 800,
+
+      codevisible: false,
+      codeInfo: {},
+      codevisible2: false,
+      codeInfo2: {},
+
+      columns: [
+        {
+          title: "Name",
+          dataIndex: "name",
+          key: "name",
+        },
+        {
+          title: "Age",
+          dataIndex: "age",
+          key: "age",
+          width: "12%",
+        },
+        {
+          title: "Address",
+          dataIndex: "address",
+          width: "30%",
+          key: "address",
+        },
+      ],
+      data: [
+        {
+          key: 1,
+          name: "John Brown sr.",
+          age: 60,
+          address: "New York No. 1 Lake Park",
+        },
+        {
+          key: 2,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 3,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 4,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 5,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 6,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 7,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+      ],
+      selectedRowKeys: [],
     });
 
     const showDrawer = () => {
@@ -248,94 +333,101 @@ export default {
     //下载二维码图片
     const downloadQr = (num) => {
       console.log("num", num);
-      state.qrcodeSize=num
- let filename = `${new Date().getTime()}.png`;
- let canvas=document.getElementsByTagName('canvas')[0]
-        let imageUrl = canvas.toDataURL("image/png")
+      state.qrcodeSize = num;
+      let filename = `${new Date().getTime()}.png`;
+      let canvas = document.getElementsByTagName("canvas")[0];
+      let imageUrl = canvas.toDataURL("image/png");
 
-let canvasBox = document.createElement('canvas');
-	let	ctx = canvasBox.getContext("2d");
-		var img = new Image();
-		// 需要添加文字的图片
-		img.src = imageUrl;
-		// 等待图片加载完成
-		img.onload = function(){
-			// 将图片添加到canvas
-		    ctx.drawImage(img, 0, 0, 1240, 2208)
-			// 设置字体
-			ctx.font = "73px 微软雅黑 bolder"
-			// 设置字体颜色
-			ctx.fillStyle = "#955f17"
-			ctx.textAlign = "center"
-			// 添加文字和位置
-			ctx.fillText("微信名", 621, 1050);
-    
-			// 导出为图片
-			let url = canvasBox.toDataURL("image/png")
-      let a = document.createElement("a");
-			 a.style.display = "none";
+      let canvasBox = document.createElement("canvas");
+      let ctx = canvasBox.getContext("2d");
+      var img = new Image();
+      // 需要添加文字的图片
+      img.src = imageUrl;
+      // 等待图片加载完成
+      img.onload = function () {
+        // 将图片添加到canvas
+        ctx.drawImage(img, 0, 0, 1240, 2208);
+        // 设置字体
+        ctx.font = "73px 微软雅黑 bolder";
+        // 设置字体颜色
+        ctx.fillStyle = "#955f17";
+        ctx.textAlign = "center";
+        // 添加文字和位置
+        ctx.fillText("微信名", 621, 1050);
+
+        // 导出为图片
+        let url = canvasBox.toDataURL("image/png");
+        let a = document.createElement("a");
+        a.style.display = "none";
         a.download = filename;
         a.href = url;
         document.body.appendChild(a);
         a.click();
-    }
-
-
-        // let a = document.createElement("a");
-        // a.style.display = "none";
-        // a.download = filename;
-        // a.href = imageUrl;
-        // document.body.appendChild(a);
-        // a.click();
+      };
 
+      // let a = document.createElement("a");
+      // a.style.display = "none";
+      // a.download = filename;
+      // a.href = imageUrl;
+      // document.body.appendChild(a);
+      // a.click();
 
       html2canvas(document.querySelector("#qrcode"), {
         useCORS: true, //支持图片跨域
       }).then((canvas) => {
-// var extra_canvas = document.createElement("canvas");
-//                 extra_canvas.setAttribute('width',num);
-//                 extra_canvas.setAttribute('height',num);
-//                 var ctx = extra_canvas.getContext('2d');
-//                 ctx.drawImage(canvas,0,0,num,num);
-//                 let filename = `${new Date().getTime()}.png`;
-//                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
+        // var extra_canvas = document.createElement("canvas");
+        //                 extra_canvas.setAttribute('width',num);
+        //                 extra_canvas.setAttribute('height',num);
+        //                 var ctx = extra_canvas.getContext('2d');
+        //                 ctx.drawImage(canvas,0,0,num,num);
+        //                 let filename = `${new Date().getTime()}.png`;
+        //                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
 
-        console.log('canvas',canvas, canvas.width,canvas.style.width)
-      
-      // //   let ctx = canvas.getContext('2d');
-      // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
-      // //            canvas.width=num
-      // //  canvas.height=num
-      // //  canvas.style.width=num+'px'
-      // // canvas.style.height=num+'px'
-      //   let filename = `${new Date().getTime()}.png`;
-      //   let imageUrl = canvas.toDataURL("image/png");
-      //   let a = document.createElement("a");
-      //   a.style.display = "none";
-      //   a.download = filename;
-      //   a.href = imageUrl;
-      //   document.body.appendChild(a);
-      //   a.click();
+        console.log("canvas", canvas, canvas.width, canvas.style.width);
+
+        // //   let ctx = canvas.getContext('2d');
+        // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
+        // //            canvas.width=num
+        // //  canvas.height=num
+        // //  canvas.style.width=num+'px'
+        // // canvas.style.height=num+'px'
+        //   let filename = `${new Date().getTime()}.png`;
+        //   let imageUrl = canvas.toDataURL("image/png");
+        //   let a = document.createElement("a");
+        //   a.style.display = "none";
+        //   a.download = filename;
+        //   a.href = imageUrl;
+        //   document.body.appendChild(a);
+        //   a.click();
       });
     };
 
     //显示二维码弹窗
-    const changeCodevisible=()=>{
-      state.codevisible=true
-      state.codeInfo={
-        title:"签到二维码",
-        name:'管理者进阶面授课程',
-        url:"https://www.baidu.com/",
+    const changeCodevisible = () => {
+      state.codevisible = true;
+      state.codeInfo = {
+        title: "签到二维码",
+        name: "管理者进阶面授课程",
+        url: "https://www.baidu.com/",
+      };
+    };
+    const changeCodevisible2 = () => {
+      state.codevisible2 = true;
+      state.codeInfo2 = {
+        title: "签到二维码2222",
+        name: "管理者进阶面授课程2222",
+        url: "https://blog.csdn.net/qq_44034384/article/details/93612152",
+      };
+    };
+
+    const onSelectChange = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+
+      if (selectedRowKeys.length > 2) {
+        return;
       }
-    }
-    const changeCodevisible2=()=>{
-      state.codevisible2=true
-      state.codeInfo2={
-        title:"签到二维码2222",
-        name:'管理者进阶面授课程2222',
-        url:"https://blog.csdn.net/qq_44034384/article/details/93612152",
-      }
-    }
+      state.selectedRowKeys = selectedRowKeys;
+    };
     return {
       ...toRefs(state),
       showDrawer,
@@ -346,6 +438,8 @@ let canvasBox = document.createElement('canvas');
       downloadQr,
       changeCodevisible,
       changeCodevisible2,
+
+      onSelectChange,
     };
   },
 };
@@ -353,7 +447,7 @@ let canvasBox = document.createElement('canvas');
 <style lang="scss">
 .systemManage {
   width: 100%;
-  
+
   .ant-input-textarea-show-count {
     position: relative;
   }

From 0fe0e74a7570142357619150d93c24102cd72bbe Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Mon, 21 Nov 2022 13:32:21 +0800
Subject: [PATCH 75/90] =?UTF-8?q?=E6=B7=BB=E6=A1=88=E4=BE=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=A0=87=E8=AE=B0=E5=BC=B9=E7=AA=97=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=AD=94=E5=8D=B7=E6=9F=A5?=
 =?UTF-8?q?=E6=8A=95=E7=A5=A8=E6=8A=BD=E5=B1=89=E8=80=83=E5=8B=A4=E9=9D=A2?=
 =?UTF-8?q?=E7=AE=A1=E6=B7=BB=E5=9C=A8=E7=BA=BF=E6=B3=A8=E9=87=8A=E5=8F=8A?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=80=83=E5=92=8C=E6=B5=8B=E7=AE=A1=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                           |   1 +
 src/api/indexCase.js                        |   2 +-
 src/api/indexEval.js                        |   2 +-
 src/api/indexTest.js                        |  19 +
 src/components/drawers/ AssessmentList.vue  |  17 +-
 src/components/drawers/ActiveAttendance.vue | 103 +----
 src/components/drawers/AddCase.vue          | 105 +++--
 src/components/drawers/AddEval.vue          |  19 +-
 src/components/drawers/AddInvist.vue        |   2 +-
 src/components/drawers/AddOnline.vue        |  66 ++-
 src/components/drawers/AddTest.vue          |   9 +-
 src/components/drawers/AllStuOver.vue       | 161 ++++++++
 src/components/drawers/CheckQue.vue         | 287 +++++++++++++
 src/components/drawers/CheckVote.vue        | 108 +++--
 src/components/drawers/EvList.vue           | 173 +++-----
 src/components/drawers/FaceManage.vue       | 432 +++++++-------------
 src/components/drawers/SelectTest.vue       | 162 +++++---
 src/components/drawers/TestManage.vue       | 202 ++++++---
 src/components/drawers/TimeManage.vue       | 118 +++---
 src/components/drawers/WorkManage.vue       |  97 +++--
 src/views/projectcenter/TaskPage.vue        | 247 +----------
 vue.config.js                               |   2 +-
 22 files changed, 1259 insertions(+), 1075 deletions(-)
 create mode 100644 src/api/indexTest.js
 create mode 100644 src/components/drawers/AllStuOver.vue
 create mode 100644 src/components/drawers/CheckQue.vue

diff --git a/src/api/config.js b/src/api/config.js
index fc8ebe82..90d5a99d 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -23,6 +23,7 @@ http.interceptors.request.use(
       console.log("当前请求页面无token,请执行操作！！！");
       // 此处测试默认配置token
       config.headers.token = "123456";
+      // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njg4NjI2MTAsImV4cCI6MTY2ODg2OTgxMCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.defa91ecb2b61d9b20d858db0c2c8d7d80dea4613cb2559a22569b7df36b3f6b";
     }
     return config;
   },
diff --git a/src/api/indexCase.js b/src/api/indexCase.js
index 3cde9d27..96d0d3ca 100644
--- a/src/api/indexCase.js
+++ b/src/api/indexCase.js
@@ -1,4 +1,4 @@
 import http from "./config";
 
 //获取案例信息
-export const queryCasesDetailList = (obj) => http.post(" /cases/queryCasesDetailList", obj);
\ No newline at end of file
+export const queryCasesDetailList = (obj) => http.post("/cases/queryCasesDetailList", obj);
\ No newline at end of file
diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index e7419800..7f2da7ce 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -68,7 +68,7 @@ export const updateEvaluation = (obj) =>
 
 //测评列表查询接口
   export const choiceEvaluation = (obj) =>
-  http.post("  /evaluation/choiceEvaluation", obj);
+  http.post("/evaluation/choiceEvaluation", obj);
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/api/indexTest.js b/src/api/indexTest.js
new file mode 100644
index 00000000..bf7b5eab
--- /dev/null
+++ b/src/api/indexTest.js
@@ -0,0 +1,19 @@
+import http from "./config";
+
+
+//创建考试信息接口
+export const createExamination = (obj) => http.post('/examination/createExamination',obj);
+//根据Id删除考试信息
+export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',{params:obj});
+//根据ID获取考试信息详情
+export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',{params:obj});
+//获取考试试卷
+// export const queryExaminationPaper = (obj) => http.post('/examination/queryExaminationPaper',obj);
+export const queryExaminationPaper = (obj) => http.post('/examination/queryExaminationPaperList',obj);
+//修改考试信息接口
+export const updateExamination = (obj) => http.post('/examination/updateExamination',obj,{
+    header:{
+        'token': '123',
+        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+    }
+});
\ No newline at end of file
diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
index ab7d1fff..1b7d4992 100644
--- a/src/components/drawers/ AssessmentList.vue	
+++ b/src/components/drawers/ AssessmentList.vue	
@@ -46,7 +46,7 @@
               expandRowByClick="true"
               @expand="expandTable"
               :pagination="false"
-              :row-selection="rowSelection"
+              :row-selection=" rowSelection "
               filterMultiple:false
             />
 
@@ -70,7 +70,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexInvist.js";
 import dayjs from "dayjs";
 export default {
@@ -142,15 +142,19 @@ export default {
     };
     const rowSelection = {
       type: "radio",
-      onSelect:(selectedRows,)=>{
+      onSelect:(selectedRows)=>{
         state.assessment = selectedRows;
         console.log("selectedRows=======",state.assessment);
         ctx.emit("checkedAss", state.assessment);
-        state.selectedRowKeys = [],
+        state.selectedRowKeys = []
         closeDrawer();
-      }
-     
+      },
     };
+    // const onSelectChange = (selectedRowKeys) => {
+    //   if(selectedRowKeys.length>2){return}
+    //   state.selectedRowKeys = selectedRowKeys;
+    // };
+
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
@@ -201,7 +205,6 @@ export default {
       state.inputV1 = "";
       getAllInvistText();
     };
-
     return {
       ...toRefs(state),
       afterVisibleChange,
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index b7ec2d8b..5b6faf4e 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -92,15 +92,14 @@
             <div class="left">
               <div class="img"></div>
               <div class="text" style="margin-left: 10px">已选择</div>
-              <div class="text2">2</div>
+              <div class="text2">{{selectedRowKeys.length}}</div>
               <div class="text">项</div>
               <div class="text3">列表选项总计：</div>
-              <div class="text4">9条</div>
+              <div class="text4">{{tableData.length}}条</div>
             </div>
-            <div class="right">清空</div>
+            <div class="right" @click="clearLine">清空</div>
           </div>
         </div>
-        <!-- <div class="pad"></div> -->
 
         <div class="tableBox" style="margin-top: 30px">
           <a-table
@@ -108,34 +107,14 @@
             :columns="tableDataFunc()"
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            @expand="expandTable"
             :scroll="{ x: 1300 }"
             :pagination="false"
             :row-selection="{
-              columnWidth: 30,
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
             }"
           />
         </div>
-        <!-- <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
-          <a-table
-            style="border: 1px solid #f2f6fe"
-            :columns="tablecolumns"
-            :data-source="tabledata"
-            :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            :scroll="{ x: 900, y: 350 }"
-            @expand="expandTable"
-            :pagination="false"
-            :row-selection="{
-              columnWidth: 30,
-              selectedRowKeys: selectedRowKeys,
-              onChange: onSelectChange,
-            }"
-          />
-        </div> -->
       </div>
       <div class="btnn">
         <button class="btn1">取消</button>
@@ -296,7 +275,6 @@ export default {
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
-      selectedRowKeys: [],
       signQRvisible:false, //二维码弹窗
       qdModal: false, //批量签到
       singleqjModal: false, //单独请假
@@ -347,6 +325,7 @@ export default {
           label: "项目四",
         },
       ],
+      selectedRowKeys: [],
       tableData: [
         {
           key: 1,
@@ -456,8 +435,6 @@ export default {
       state.Evisible = true;
     };
     const onSelectChange = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-
       state.selectedRowKeys = selectedRowKeys;
     };
 
@@ -514,14 +491,12 @@ export default {
         {
           title: "姓名",
           dataIndex: "name",
-          // width: "30%",
           key: "name",
           width: 50,
           align: "center",
           className: "classify",
           scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
-            // console.log(text.record.checked1);
             return (
               <div class="racona">
                 <span> {text.record.name}</span>
@@ -532,7 +507,6 @@ export default {
         {
           title: "所在部门",
           dataIndex: "com",
-          // width: "30%",
           key: "com",
           width: 50,
           align: "center",
@@ -585,18 +559,14 @@ export default {
           key: "opacation",
           width: 130,
           align: "center",
-          // scopedSlots: { customRender: "action" }, //引入的插槽
-          // customRender: () => {
-          //   return (
-          //     <div class="opa">
-          //       <a-checkbox-group />
-          //     </div>
-          //   );
-          // },
         },
       ];
       return columns;
     };
+    //清空所选
+    const clearLine = ()=> {
+      state.selectedRowKeys=[]
+    }
     const showqdModal = () => {
       state.qdModal = true;
     };
@@ -632,6 +602,7 @@ export default {
       onSelectChange,
       showEntryScore,
       tableDataFunc,
+      clearLine,
       showqdModal,
       closeqdModal,
       showsingleqdModal,
@@ -654,9 +625,7 @@ export default {
 }
 
 .largeDrawerStyle {
-  // width: 80%;
   .ant-drawer-content-wrapper {
-    // max-width: 1000px;
     .ant-drawer-header {
       display: none !important;
     }
@@ -665,7 +634,6 @@ export default {
       .drawerMain {
         min-width: 600px;
         margin: 0px 32px 0px 32px;
-        // overflow-x: auto;
         display: flex;
         flex-direction: column;
         height: 100%;
@@ -675,7 +643,6 @@ export default {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          // background-color: red;
           margin-bottom: 20px;
           flex-shrink: 0;
           .headerTitle {
@@ -683,13 +650,9 @@ export default {
             font-weight: 600;
             color: #333333;
             line-height: 25px;
-            // margin-left: 24px;
           }
         }
         .centermain {
-          // width: 100%;
-          // height: 100%;
-          // background-color: #bfa;
           flex: 1;
           overflow-y: auto;
           margin-bottom: 75px;
@@ -721,13 +684,6 @@ export default {
                   margin-top: 8px;
                   white-space: nowrap;
                 }
-                // .name {
-                //   margin-top: 8px;
-
-                //   color: rgba(0, 0, 0, 0.85);
-                //   font-size: 14px;
-                //   font-weight: 400;
-                // }
               }
             }
 
@@ -826,13 +782,12 @@ export default {
               height: 100%;
               display: flex;
               justify-content: space-between;
-              // background-color: #bfa;
               .left {
                 height: 100%;
                 display: flex;
                 align-items: center;
                 .img {
-                  width: 14px;
+                  width: 15px;
                   height: 15px;
                   background-image: url(../../assets/images/leveladd/gan.png);
                   background-size: 100% 100%;
@@ -861,18 +816,9 @@ export default {
               }
             }
           }
-          .pad {
-            width: 96%;
-            height: 10px;
-            background-color: #fff;
-            position: absolute;
-          }
           .tableBox {
-            // margin-bottom: 80px;
 
             .classify {
-              // margin-left: 11px !important;
-              // padding-left: 9px !important;
               padding-left: 0px !important;
             }
             .ant-checkbox-wrapper {
@@ -881,7 +827,6 @@ export default {
             }
             .ant-table-selection-column {
               padding: 0px !important;
-              // padding-left: 45px !important;
             }
             .ant-table-thead > tr > th {
               background-color: rgba(239, 244, 252, 1);
@@ -895,35 +840,13 @@ export default {
               > td {
               background: #f6f9fd;
             }
-            // .opa {
-            //   background-color: #bfa;
-            // }
           }
-          // .tab {
-          //   .ant-table-thead > tr > th {
-          //     background-color: rgba(239, 244, 252, 1) !important;
-          //   }
-
-          //   th.h {
-          //     background-color: #eff4fc !important;
-          //   }
-
-          //   .ant-table-tbody
-          //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          //     > td {
-          //     background: #f6f9fd;
-          //   }
-          // }
         }
         .btnn {
           height: 72px;
           width: 100%;
-          // position: absolute;
           background-color: #fff;
-          // bottom: 0;
-          // left: 0;
           display: flex;
-          // display: none;
           align-items: center;
           justify-content: center;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
@@ -948,12 +871,6 @@ export default {
           }
         }
       }
-      // .botm {
-      //   width: 100%;
-      //   height: 90px;
-      //   // background-color: red;
-      //   // flex-shrink: 1;
-      // }
     }
   }
 }
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index b6315aee..293ac1e7 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -49,15 +49,11 @@
             :row-class-name="
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
             "
-            :row-selection="rowSelection"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect }"
             :columns="tableDataFunc()"
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            this.getMilitaryDeployment()
-            @expand="expandTable"
             :pagination="false"
-            filterMultiple:false
           />
           <div class="pa">
             <a-pagination
@@ -81,7 +77,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexCase.js";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
@@ -106,11 +102,11 @@ export default {
     },
     projectId: {
       type: Number,
-      default: null,
+      default: 0,
     },
     chooseStageId: {
       type: Number,
-      default: null,
+      default: 0,
     },
     routerTaskId: {
       type: Number,
@@ -124,7 +120,7 @@ export default {
     projectTaskId: {
       // 要编辑的projectId
       type: Number,
-      default: null,
+      default: 0,
     },
     routerId: {
       type: Number,
@@ -141,10 +137,12 @@ export default {
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
+      selectedRowKeys:[],
+      apiTaskList:[],
       inputV1: "",
       time: undefined,
-      assessmentId: null,
-      assessmentName: "",
+      caseId: null,
+      caseName: "",
     });
     const closeDrawer = () => {
       ctx.emit("update:addcaseVisible", false);
@@ -153,6 +151,7 @@ export default {
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = () => {
+      getAllCaseText()
     };
     const tableDataFunc = () => {
       const columns = [
@@ -182,12 +181,14 @@ export default {
       ];
       return columns;
     };
-    const rowSelection = {
-      onSelect: (selectedRows) => {
-        state.assessmentId = selectedRows.assessmentId;
-        state.assessmentName = selectedRows.name;
-      },
+    const onSelectChange = (selectedRowKeys,selectedRows)=> {
+      state.selectedRowKeys = selectedRowKeys;
+      state.apiTaskList = selectedRows;
     };
+    const onSelect = ( record ) => {
+      state.caseId = record.caseid;
+      state.caseName = record.title;
+    }
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
@@ -203,7 +204,7 @@ export default {
           authorName:value.authorName,
           companyId:value.companyId,
           coverUrl:value.coverUrl,
-          caseid:value.caseid,
+          caseid:value.id,
           title:value.title,
         };
         array.push(obj);
@@ -222,21 +223,19 @@ export default {
           "top": true
         })
         .then((res) => {
-          let arr = res.data.data;
           if (res.status === 200) {
-            getTableDate(arr);
+            getTableDate(res.data.data);
           }
         })
         .catch(() => {
-          console.log('---------------------获取全部案例信息接口失败-----------------------');
         });
     };
     const updateTask = () => {
       if (props.isLevel == 1) {
         RouterEditTask({
           chapterId: props.isactive,
-          courseId: state.assessmentId,
-          name: state.assessmentName,
+          courseId: state.caseId,
+          name: state.caseName,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
           type: 3,
@@ -251,14 +250,53 @@ export default {
             message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
+        if(state.apiTaskList.length > 1){
+          // for((item,index) in state.apiTaskList){
+          //   apiTask
+          //   .addTask({
+          //     "courseId": item.caseId,
+          //     "duration": 0,
+          //     "flag": true,
+          //     "name": item.caseName,
+          //     "projectId": props.projectId,
+          //     "projectTaskId": props.projectTaskId,
+          //     "stageId": props.chooseStageId,
+          //     "type": 3,
+          //   })
+          for(let i = 0;i <= state.apiTaskList.length;i++){
+            apiTask
+            .addTask({
+              "courseId": state.apiTaskList[i].caseId,
+              "duration": 0,
+              "flag": true,
+              "name": state.apiTaskList[i].caseName,
+              "projectId": props.projectId,
+              "projectTaskId": props.projectTaskId,
+              "stageId": props.chooseStageId,
+              "type": 3,
+            })
+            .then(() => {
+              message.destroy()
+              message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+              ctx.emit("changeData", false);
+              closeDrawer();
+            })
+            .catch(() => {
+              message.destroy()
+              message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+            });
+          }
+        } else {
         apiTask
           .addTask({
-            courseId: state.assessmentId,
-            name: state.assessmentName,
-            projectId: props.projectId,
-            projectTaskId: props.projectTaskId || 0,
-            stageId: props.chooseStageId,
-            type: 3,
+            "courseId": state.caseId,
+            "duration": 0,
+            "flag": true,
+            "name": state.caseName,
+            "projectId": props.projectId,
+            "projectTaskId": props.projectTaskId,
+            "stageId": props.chooseStageId,
+            "type": 3,
           })
           .then(() => {
             message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
@@ -266,8 +304,9 @@ export default {
             closeDrawer();
           })
           .catch(() => {
-            message.success(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
+        }
       } else if (props.isLevel == 3) {
         console.log("");
       }
@@ -277,16 +316,13 @@ export default {
       state.inputV1 = "";
       getAllCaseText();
     };
-    onMounted(() => {
-      // createCase();
-      getAllCaseText();
-    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       tableDataFunc,
-      rowSelection,
+      onSelectChange,
+      onSelect,
       handelChangePage,
       getTableDate,
       updateTask,
@@ -319,6 +355,7 @@ export default {
       }
     }
     .contentMain {
+      padding-right: 15px;
       .main_items {
         margin-top: 32px;
         display: flex;
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 6f1fc0a5..0a58aef2 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -52,16 +52,6 @@
                 选择测评
               </button>
             </div>
-            <div>
-              <div>
-                <EvList
-                  v-model:EvalListVisible="EvalListVisible"
-                  v-model:evaluationTypeId="evaluationTypeId"
-                  v-model:evaluationTypeName="evaluationTypeName"
-                  @getEvLsitDate="checkFinish"
-                />
-              </div>
-            </div>
           </div>
           <div class="main_item">
             <div class="signbox">
@@ -96,6 +86,13 @@
         <button class="btn2" @click="createEvalText">确定</button>
       </div>
     </div>
+    <EvList
+      v-model:EvalListVisible="EvalListVisible"
+      @getEvLsitDate="checkFinish"
+    />
+    <!-- v-model:evaluationTypeId="evaluationTypeId"
+      v-model:evaluationTypeName="evaluationTypeName" -->
+
     <!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
       <a-spin :spinning="addLoading" tip="添加中..." />
     </div> -->
@@ -268,7 +265,7 @@ export default {
         evaluationTypeId: state.evaluationTypeId,
         evaluationTypeName: state.evaluationTypeName,
       };
-      if (props.edit) {
+      if (props.edit !== true) {
         api
           .createEvaluation(obj)
           .then((res) => {
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 212678fc..2ba29abd 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -199,7 +199,7 @@ export default {
             closeDrawer();
           })
           .catch(() => {
-            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
         console.log("");
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 64dad65f..11377929 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -59,13 +59,13 @@
           <div class="mntc_left">
             <div class="notice_icon"></div>
             <span style="color: rgba(0, 0, 0, 0.65); margin-right: 17px"
-              >已选择 <span style="color: #388be1">{{ RowsNum }}</span> 项</span
+              >已选择 <span style="color: #388be1">{{ selectedRowKeys.length }}</span> 项</span
             >
             <span style="color: rgba(0, 0, 0, 0.65)"
               >列表选项总计：<span>{{ tableDataTotal }}</span> 条</span
             >
           </div>
-          <div class="mntc_right">
+          <div class="mntc_right" @click="clearLine">
             <span style="color: #387df7; margin-right: 24px">清空</span>
           </div>
         </div>
@@ -75,15 +75,15 @@
             :row-class-name="
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
             "
-            :row-selection="rowSelection"
+            :row-selection="{
+              selectedRowKeys:selectedRowKeys,
+              onChange:onSelectChange,
+              onSelect:onSelected,
+              }"
             :columns="tableDataFunc()"
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            this.getMilitaryDeployment()
-            @expand="expandTable"
             :pagination="false"
-            filterMultiple:false
           />
           <div class="pa">
             <a-pagination
@@ -107,7 +107,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexInvist.js";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
@@ -172,7 +172,7 @@ export default {
       time: undefined,
       assessmentId: null,
       assessmentName: "",
-      RowsNum: 0,
+      selectedRowKeys:[],
       tableData: [],
       currentPage: 1,
       tableDataTotal: 0,
@@ -181,11 +181,11 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addonlineVisible", false);
       ctx.emit("update:edit", false);
-      // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = () => {
+      getAllOnlineText();
     };
     const tableDataFunc = () => {
       const columns = [
@@ -199,7 +199,6 @@ export default {
         {
           title: "名称",
           dataIndex: "name",
-          // width: "30%",
           key: "name",
           width: "100px",
           align: "left",
@@ -236,25 +235,18 @@ export default {
       ];
       return columns;
     };
-    const rowSelection = {
-      checkStrictly: false,
-      onSelectAll: (selected) => {
-        if (selected == true) {
-          state.RowsNum = state.tableDataTotal;
-        } else {
-          state.RowsNum = 0;
-        }
-      },
-      onSelect: (selectedRows, selected) => {
-        if (selected == true) {
-          state.RowsNum++;
-        } else {
-          state.RowsNum--;
-        }
-        state.assessmentId = selectedRows.assessmentId;
-        state.assessmentName = selectedRows.name;
-      },
-    };
+    const onSelected = (record) => {
+      state.assessmentId = record.assessmentId;
+      state.assessmentName = record.name;
+    }
+    const onSelectChange = (selectedRowKeys,b) => {
+      state.selectedRowKeys = selectedRowKeys
+      console.log(b);
+    }
+    //清空所选
+    const clearLine = ()=> {
+      state.selectedRowKeys=[]
+    }
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
@@ -265,7 +257,7 @@ export default {
       let array = [];
       data.map((value, index) => {
         let obj = {
-          key: index,
+          key: index+1,
           assessmentId: value.assessmentId,
           num: value.essayQuestionVoList.length,
           name: value.assessmentName ? value.assessmentName : "-",
@@ -305,12 +297,14 @@ export default {
           type: 1,
         })
           .then(() => {
+            message.destroy()
             message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
           })
           .catch(() => {
+            message.destroy()
             message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
           });
       } else if (props.isLevel == 2) {
@@ -324,11 +318,13 @@ export default {
             type: 1,
           })
           .then(() => {
+            message.destroy()
             message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
             ctx.emit("changeData", false);
             closeDrawer();
           })
           .catch(() => {
+            message.destroy()
             message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
           });
       } else if (props.isLevel == 3) {
@@ -340,16 +336,14 @@ export default {
       state.inputV1 = "";
       getAllOnlineText();
     };
-    onMounted(() => {
-      // createOnline();
-      getAllOnlineText();
-    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       tableDataFunc,
-      rowSelection,
+      onSelected,
+      onSelectChange,
+      clearLine,
       handelChangePage,
       getAllOnlineText,
       getTableDate,
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index ffbbf830..82c24cf7 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -306,7 +306,7 @@
       <a-spin :spinning="addLoading" tip="添加中..." />
     </div>
     <!-- 选择考试抽屉 -->
-    <s-test v-model:STvisible="STvisible"/>
+    <s-test v-model:STvisible="STvisible" @getSTData="getData"/>
   </a-drawer>
 </template>
 <script>
@@ -405,6 +405,8 @@ export default {
       addLoading: false,
       isOuter: 1, // 是否为外部考试
       STvisible:false, //选择试卷抽屉
+      paperId:null,  //试卷id 子组件传过来给考试抽屉创建考试信息需要
+      paperName:"", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
       choosedTestList: [
         {
           value: "提高核心竞争力",
@@ -748,6 +750,10 @@ export default {
       );
       state.choosedTestList = tags;
     };
+    const getData = (value)=> {
+      state.paperId = value.paperId;
+      state.paperName = value.paperName;
+    }
     return {
       formState,
       afterVisibleChange,
@@ -770,6 +776,7 @@ export default {
       changeOuter,
       chooseTest,
       closeTag,
+      getData,
       ...toRefs(state),
     };
   },
diff --git a/src/components/drawers/AllStuOver.vue b/src/components/drawers/AllStuOver.vue
new file mode 100644
index 00000000..b5c89e72
--- /dev/null
+++ b/src/components/drawers/AllStuOver.vue
@@ -0,0 +1,161 @@
+<template>
+    <a-modal
+        :visible="ASOvervisible"
+        :closable="closable"
+        centered="true"
+        :footer="null"
+        wrapClassName="AllStuOverModel"
+        @cancel="closeModal"
+    >
+        <div class="head">
+            <div class="inhead">
+                <div class="left">
+                    <div class="gan"></div>
+                    <div class="tis">提示</div>
+                </div>
+                <div class="right" @click="closeModal"></div>
+            </div>
+        </div>
+        <div class="main">确定将所选学员标记完成吗</div>
+        <div class="butn">
+            <button class="btn btn1" @click="closeModal">取消</button>
+            <button class="btn btn2" @click="check">确定</button>
+        </div>
+    </a-modal>
+</template>
+
+<script>
+import { toRefs, reactive } from "vue";
+export default {
+props: {
+    ASOvervisible:{
+        type:Boolean,
+        default:false
+    }
+},
+setup(props,ctx){
+    const state = reactive({
+        closable:false,
+    });
+    const closeModal = () => {
+        ctx.emit("update:ASOvervisible", false);
+    };
+    const check = () => {
+      closeModal();
+    };
+    return{
+        ...toRefs(state),
+        closeModal,
+        check,
+    }
+}
+};
+</script>
+<style lang="scss">
+.AllStuOverModel {
+  .ant-modal {
+    width: 424px;
+    height: 258px;
+
+    .ant-modal-content {
+      width: 424px;
+      height: 258px;
+
+      .ant-modal-body {
+        width: 424px;
+        height: 258px;
+        padding: 0px;
+
+        .head {
+          width: 424px;
+          height: 68px;
+          // position: absolute;
+          // left: 0;
+          // top: 0;
+          background: linear-gradient(
+            180deg,
+            rgba(78, 166, 255, 0.2) 0%,
+            rgba(78, 166, 255, 0) 100%
+          );
+          display: flex;
+
+          justify-content: center;
+
+          .inhead {
+            width: 90%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .left {
+              display: flex;
+              align-items: center;
+
+              .gan {
+                width: 16px;
+                height: 16px;
+                background-image: url(../../assets/images/taskpage/gan.png);
+              }
+
+              .tis {
+                margin-left: 5px;
+                width: 32px;
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+              }
+            }
+
+            .right {
+              width: 22px;
+              height: 22px;
+              background-image: url(../../assets/images/basicinfo/close.png);
+              background-size: 100% 100%;
+              cursor: pointer;
+            }
+          }
+        }
+
+        .main {
+          margin-top: 20px;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          font-size: 14px;
+          font-weight: 400;
+          color: #333333;
+        }
+
+        .butn {
+          width: 100%;
+          display: flex;
+          margin-top: 60px;
+          justify-content: center;
+
+          .btn {
+            width: 100px;
+            height: 40px;
+            border-radius: 4px;
+            cursor: pointer;
+          }
+
+          .btn1 {
+            color: #387df7;
+
+            background: #ffffff;
+            border: 1px solid #387df7;
+          }
+
+          .btn2 {
+            background: #409eff;
+            color: #fff;
+            border: 0;
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/CheckQue.vue b/src/components/drawers/CheckQue.vue
new file mode 100644
index 00000000..dcfafaa4
--- /dev/null
+++ b/src/components/drawers/CheckQue.vue
@@ -0,0 +1,287 @@
+<template>
+    <a-drawer
+    :visible="CQvisible"
+    class="drawerStyle CheckWork"
+    placement="right"
+    width="40%"
+    @after-visible-change="afterVisibleChange"
+    >
+        <div class="drawerMain">
+            <div class="headersub">
+                <div class="headerTitle">查看答卷</div>
+                <img 
+                style="width:29px;height:29px;cursor:pointer"
+                src="../../assets/images/basicinfo/close.png" 
+                @click="closeDrawer"
+                />
+            </div>
+            <div class="headersup"><span>评估名称：<span style="color:#999ba3">管理者进阶作业</span></span><span style="margin-left:25px">考试总分：<span style="color:#999ba3">100分</span></span><span style="margin-left:25px">及格分：<span style="color:#999ba3">60分</span></span></div>
+            <div class="main">
+                <div class="basetext"><span>考试成绩：</span><span>{{score}}</span></div>
+                <div class="basequestion">
+                    <div class="ques" v-for=" item,index  in queData" :key="index">
+                        <div class="quename">{{ index+1 + "、" + "【" + item.quetype + "】" + item.quename }}</div>
+                        <div class="queanswer">
+                            <div class="queabox" v-for="items,index in item.answer" :key="index">
+                                <div class="single" v-if="item.quetype === '判断' ">
+                                    <a-radio-group v-model:value="items.index">
+                                        <div class="queaboxs">
+                                            <a-radio
+                                            v-model:checked="checked"
+                                            :value="1"
+                                            style="margin-bottom:5px"
+                                            >
+                                                正确
+                                            </a-radio>
+                                            <a-radio
+                                            v-model:checked="checked"
+                                            :value="2"
+                                            style="margin-bottom:5px"
+                                            >
+                                                错误
+                                            </a-radio>
+                                        </div>
+                                    </a-radio-group>
+                                    <div class="analysisbox">
+                                        <div class="answer">
+                                            <span>答案：</span>{{items.answercontent}}
+                                        </div>
+                                        <div class="analysis">
+                                            <span>解析：</span>{{items.analysis}}
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="multiple" v-if="item.quetype === '多选' ">
+                                    <a-checkbox
+                                    :value="items.value">
+                                        {{items.answercontent}}
+                                    </a-checkbox>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="btnn">
+                <button class="btn1">取消</button>
+                <button class="btn2">确定</button>
+            </div>
+        </div>
+    </a-drawer>
+</template>
+
+<script>
+import { toRefs,reactive } from '@vue/reactivity';
+export default {
+    name:"CheckWork",
+    props:{
+        CQvisible:{
+            type:Boolean,
+            default:false,
+        },
+    },
+    setup(props,ctx){
+        const state = reactive({
+            score:null,  //传过来赋给score
+            queData:[
+                {
+                    quetype:"判断",
+                    quename:"当前项目对您是否有帮助?",
+                    value:1,
+                    answer:[
+                        {
+                            value:1,
+                            answercontent:"错误",
+                            analysis:"暂无解析",
+                        },
+                    ]
+                },
+                {
+                    quetype:"多选",
+                    quename:"哪些项目跨年快乐memememememeemme?",
+                    value:2,
+                    answer:[
+                        {
+                            value:1,
+                            answercontent:"A、有帮助"
+                        },
+                        {   
+                            value:2,
+                            answercontent:"B、mei帮助"
+                        },
+                        {   
+                            value:3,
+                            answercontent:"C、mei5155帮助"
+                        },
+                        {   
+                            value:4,
+                            answercontent:"D、12345mei帮助"
+                        }
+                    ],
+                    answercontent:"错误",
+                    analysis:"暂无解析",
+                },
+                {
+                    quetype:"多选",
+                    quename:"哪些项目跨年快乐memememememeemme?",
+                    value:3,
+                    answer:[
+                        {
+                            value:1,
+                            answercontent:"A、有帮助"
+                        },
+                        {   
+                            value:2,
+                            answercontent:"B、mei帮助"
+                        },
+                        {   
+                            value:3,
+                            answercontent:"C、mei5155帮助"
+                        },
+                        {   
+                            value:4,
+                            answercontent:"D、12345mei帮助"
+                        }
+                    ]
+                },
+                {
+                    quetype:"判断",
+                    quename:"当前项目对您是否有帮助?",
+                    value:4,
+                    answer:[
+                        {
+                            value:1,
+                            answercontent:"错误",
+                            analysis:"暂无解析",
+                        },
+                    ]
+                },
+            ],
+        })
+
+        const closeDrawer = ()=> {
+            ctx.emit("update:CQvisible",false)
+        }
+        const afterVisibleChange = (bool) => {
+            console.log(bool);
+        }
+        return{
+            ...toRefs(state),
+            closeDrawer,
+            afterVisibleChange,
+        }
+    }
+};
+</script>
+<style lang="scss">
+.CheckWork {
+    .drawerMain {
+        min-width: 400px;
+        margin: 0px 32px 0px 32px;
+        display: flex;
+        flex-direction: column;
+        .headersub {
+            height: 73px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            .headerTitle {
+                font-size: 18px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 25px;
+            }
+        }
+        .headersup{
+            border-bottom: 1px solid #e8e8e8;
+            padding-bottom: 20px;
+        }
+        .main {
+            width: 100%;
+            overflow-y: auto;
+            margin-bottom: 70px;
+            .basetext{
+                color: #333333;
+                line-height: 25px;
+                margin-top: 27px ;
+                margin-bottom: 27px ;
+            }
+            .basequestion{
+                .ques{
+                    .quename{
+                        margin: 10px auto ;
+                        font-weight: bold;
+                    }
+                    .queanswer{
+                        padding-left: 25px;
+                        .queabox{
+                            margin-bottom: 10px;
+                            .single{
+                                padding: 5px;
+                                .queaboxs{
+                                    display: flex;
+                                    flex-direction: column;
+                                }
+                                .analysisbox{
+                                    border: 1px solid #e8e8e8;
+                                    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+                                    border-radius: 8px;
+                                    margin-left: -10px;
+                                    padding: 5px 10px;
+                                }
+                            }
+                            .multiple{
+                                padding: 5px;
+                                .queaboxs{
+                                    display: flex;
+                                    flex-direction: column;
+                                }
+                                .analysisbox{
+                                    border: 1px solid #e8e8e8;
+                                    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+                                    border-radius: 8px;
+                                    margin-left: -10px;
+                                    padding: 5px 10px;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        .btnn {
+            height: 72px;
+            width: 100%;
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            background-color: #fff;
+            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/CheckVote.vue b/src/components/drawers/CheckVote.vue
index 527ff43c..5e8b862a 100644
--- a/src/components/drawers/CheckVote.vue
+++ b/src/components/drawers/CheckVote.vue
@@ -7,26 +7,34 @@
     @after-visible-change="afterVisibleChange"
     >
         <div class="drawerMain">
-            <div class="header">
+            <div class="headersub">
                 <div class="headerTitle">查看投票</div>
                 <img 
                 style="width:29px;height:29px;cursor:pointer"
                 src="../../assets/images/basicinfo/close.png" 
                 @click="closeDrawer"
                 />
-                <!-- <div class="suptit"><span>评估名称：<span>管理者进阶投票</span></span></div> -->
             </div>
+            <div class="headersup"><span>评估名称：<span style="color:#999ba3">管理者进阶投票</span></span></div>
             <div class="main">
-                <div class="basetext"><span>基础信息</span></div>
-                <div class="HW Name"><span>作业名称：</span ><span style="color:#999ba3">{{"管理者进阶作业"}}</span></div>
-                <div class="HW Need"><span>作业要求：</span ><span style="color:#999ba3">{{"写一篇观后感，字数600字"}}</span></div>
-                <div class="HWText">
-                    <span>作业信息：</span>
-                    <div class="hwText">
-                        <img src="@/assets/images/projectadd/keep.png"/>
-                        <div class="hwName">{{"京东方商业模型.jpeg"}}</div>
-                        <div class="op"> <span>查看</span> </div>
-                        <div class="op"> <span>下载</span> </div>
+                <div class="basetext"><span>投票说明</span></div>
+                <div class="basequestion">
+                    <div class="ques" v-for=" item,index  in queData" :key="index">
+                        <div class="quename">{{ index+1 +"."+ item.quename }}</div>
+                        <div class="queanswer">
+                            <a-radio-group v-model:value="item.value">
+                                <div class="queaboxs" :style="{display: item.quetype  ? 'flex' : 'block'}">
+                                    <div class="queabox" v-for="items,index in item.answer" :key="index">
+                                        <a-radio
+                                            v-model:checked="checked"
+                                            :value="items.value"
+                                        >
+                                            {{items.answercontent}}
+                                        </a-radio>
+                                    </div>
+                                </div>
+                            </a-radio-group>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -50,8 +58,41 @@ export default {
     },
     setup(props,ctx){
         const state = reactive({
-
+            valueE1:"",
+            queData:[
+                {
+                    quetype:false,
+                    quename:"当前项目对您是否有帮助?",
+                    value:1,
+                    answer:[
+                        {
+                            value:1,
+                            answercontent:"有帮助"
+                        },
+                        {   
+                            value:2,
+                            answercontent:"mei帮助"
+                        }
+                    ]
+                },
+                {
+                    quetype:true,
+                    quename:"当前项目对您是否有帮助memememememeemme?",
+                    value:2,
+                    answer:[
+                        {
+                            value:1,
+                            answercontent:"有帮助"
+                        },
+                        {   
+                            value:2,
+                            answercontent:"mei帮助"
+                        }
+                    ]
+                }
+            ],
         })
+
         const closeDrawer = ()=> {
             ctx.emit("update:CVvisible",false)
         }
@@ -73,13 +114,12 @@ export default {
         margin: 0px 32px 0px 32px;
         display: flex;
         flex-direction: column;
-        .header {
+        .headersub {
             height: 73px;
-            border-bottom: 1px solid #e8e8e8;
             display: flex;
             justify-content: space-between;
             align-items: center;
-            margin-bottom: 20px;
+
             .headerTitle {
                 font-size: 18px;
                 font-weight: 600;
@@ -87,34 +127,32 @@ export default {
                 line-height: 25px;
             }
         }
+        .headersup{
+            border-bottom: 1px solid #e8e8e8;
+            padding-bottom: 20px;
+        }
         .main {
             width: 100%;
             overflow-y: auto;
             margin-bottom: 70px;
             .basetext{
-                font-size: 16px;
-                font-weight: 600;
                 color: #333333;
                 line-height: 25px;
+                margin-top: 27px ;
                 margin-bottom: 27px ;
             }
-            .HW{
-                margin-bottom: 20px;
-            }
-            .hwText{
-                display: flex;
-                align-items: center;
-                margin: 15px auto;
-                img{
-                    background-size: 100% 100%;
-                }
-                .hwName{
-                    margin:auto 10px;
-                }
-                .op{
-                    color:#388be1;
-                    margin: auto 20px;
-                    cursor: pointer;
+            .basequestion{
+                .ques{
+                    .quename{
+                        margin: 10px auto ;
+                        font-weight: bold;
+                    }
+                    .queanswer{
+                        padding-left: 20px;
+                        .queabox{
+                            margin-bottom: 10px;
+                        }
+                    }
                 }
             }
         }
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index d0bd45ba..5bb04782 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -47,16 +47,10 @@
             <a-table
             style="border: 1px solid #f2f6fe"
             :columns="columns"
-            :data-source="tabledata"
+            :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            @expand="expandTable"
             :pagination="false"
-            :row-selection="{
-              columnWidth: 30,
-              selectedRowKeys: selectedRowKeys,
-              onChange: onSelectChange,
-            }"
+            :row-selection="{ selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}"
           />
           <div class="pa">
             <a-pagination
@@ -81,7 +75,7 @@
     </a-drawer>
 </template>
 <script>
-  import { reactive, toRefs, ref,onMounted } from "vue";
+  import { reactive, toRefs } from "vue";
   import * as api from "../../api/indexEval";
    export default {
     name: "EvList",
@@ -108,64 +102,64 @@
         evaluationTypeId:null,
         evaluationTypeName:"",
         tableData: [],
+        selectedRowKeys:[],
+        columns:[
+            {
+            title: "课程编号",
+            width: "20%",
+            dataIndex: "quiz_code",
+            key: "code",
+            align: "center",
+          },
+          {
+            title: "title",
+            width: "20%",
+            dataIndex: "title",
+            key: "title",
+            align: "center",
+          },
+          {
+            title: "备注",
+            width: "13%",
+            dataIndex: "theme_desc",
+            key: "content",
+            align: "center",
+          },
+          {
+            title: "状态",
+            width: "13%",
+            dataIndex: "status",
+            key: "status",
+            align: "center",
+          },
+          {
+            title: "价格",
+            width: "13%",
+            dataIndex: "quiz_price",
+            key: "price",
+            align: "center",
+          },
+          {
+            title: "可答题人数",
+            width: "20%",
+            dataIndex: "quiz_range",
+            key: "time",
+            align: "center",
+          },
+        ]
       });
-    const columns = [
-      {
-        title: "课程编号",
-        width: "20%",
-        dataIndex: "kid",
-        key: "kid",
-        align: "center",
-      },
-      {
-        title: "title",
-        width: "20%",
-        dataIndex: "title",
-        key: "title",
-        align: "center",
-      },
-      {
-        title: "备注",
-        width: "13%",
-        dataIndex: "content",
-        key: "content",
-        align: "center",
-      },
-      {
-        title: "状态",
-        width: "13%",
-        dataIndex: "status",
-        key: "status",
-        align: "center",
-      },
-      {
-        title: "价格",
-        width: "13%",
-        dataIndex: "price",
-        key: "price",
-        align: "center",
-      },
-      {
-        title: "可答题人数",
-        width: "20%",
-        dataIndex: "time",
-        key: "time",
-        align: "center",
-      },
-    ];
-    const rowSelection = ref({
-      type: "radio",
-      checkStrictly: false,
-      onSelect: (selectedRows) => {
-        state.evaluationTypeName = selectedRows.title
-        state.evaluationTypeId = selectedRows.kid
-      },
-    });
+    const onSelect = (record)=> {
+      state.evaluationTypeName = record.title
+      state.evaluationTypeId = record.quiz_code
+    };
+    const onSelectChange = (selectedRowKeys)=> {
+      state.selectedRowKeys = selectedRowKeys
+    }
     const closeDrawer = () => {
       ctx.emit("update:EvalListVisible", false);
     };
     const afterVisibleChange = () => {
-      // getEvalList();
+      getAllEvalText();
     };
     const checkFinish =() =>{
       let EvListDate = {
@@ -177,77 +171,46 @@
     }
     const changePagination = (page) => {
       state.currentPage = page;
-      // getEvalList();
     };
+    
     const getTableDataList = (tableData) => {
       let data = tableData;
       let array = [];
       data.map((value) => {
         let obj = {
           status:value.status,
-          kid:value.quiz_kid,
+          quiz_code:value.quiz_code,
           title:value.title,
-          price:value.quiz_price,
-          // 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,
+          theme_desc:value.theme_desc,
+          quiz_price:value.quiz_price,
+          quiz_range:value.quiz_range,
         };
         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);
-        }
-      });
+      state.tableData = array;
     };
 
     //获取测评列表
     const getAllEvalText = ()=> {
       let objael = {
         "keyword": "",
-        "user_id": 0
+        "user_id": 0,
       }
       api
       .choiceEvaluation(objael)
       .then((res) => {
-        state.tableData = res.data.data
-        getTableDataList()
+        getTableDataList(res.data.data)
+      })
+      .catch(()=>{
       })
     }
-    onMounted(() => {
-      getAllEvalText ();
-    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      getEvalList,
+      onSelectChange,
+      onSelect,
       getTableDataList,
-      columns,
-      rowSelection,
       checkFinish,
       changePagination,
     };
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 32bd2e00..ddb3c96d 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -56,11 +56,11 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" style="margin-right: 20px" @click="showopen">
+          <div class="btn btn1" style="margin-right: 20px" @click="godie">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn2" @click="allStuOver">
             <div class="wz">批量标注完成</div>
           </div>
           <div class="btn btn2">
@@ -79,12 +79,12 @@
             <div class="left">
               <div class="img"></div>
               <div class="text" style="margin-left: 10px">已选择</div>
-              <div class="text2">2</div>
+              <div class="text2">{{selectedRowKeys.length}}</div>
               <div class="text">项</div>
               <div class="text3">列表选项总计：</div>
-              <div class="text4">9条</div>
+              <div class="text4">{{tabledata.length}}条</div>
             </div>
-            <div class="right">清空</div>
+            <div class="right" @click="clearLine">清空</div>
           </div>
         </div>
         <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
@@ -93,14 +93,12 @@
             :columns="tablecolumns"
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
             :scroll="{ x: 900 }"
-            @expand="expandTable"
             :pagination="false"
             :row-selection="{
-              columnWidth: 30,
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
+              onSelect: onSelect,
             }"
           />
           <div class="pa">
@@ -117,46 +115,27 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="ckwork()">取消</button>
+        <button class="btn1">取消</button>
         <button class="btn2">确定</button>
       </div>
-      <a-modal
-        :closable="closable"
-        v-model:visible="showmodal"
-        centered="true"
-        :footer="null"
-        wrapClassName="FacMa"
-      >
-        <div class="head">
-          <div class="inhead">
-            <div class="left">
-              <div class="gan"></div>
-              <div class="tis">提示</div>
-            </div>
-            <div class="right" @click="closeModal"></div>
-          </div>
-        </div>
-        <div class="main">确定将所选学员标记完成吗</div>
-        <div class="butn">
-          <button class="btn btn1" @click="closeModal">取消</button>
-          <button class="btn btn2" @click="check">确定</button>
-        </div>
-      </a-modal>
-      <div class="noticebox" v-show="open">
-        <div><img src="../../assets/images/taskpage/check.png" /></div>
-        <div class="notext">催促学员成功</div>
-      </div>
     </div>
   </a-drawer>
+  <!-- 批量标注完成 -->
+  <ASOver v-model:ASOvervisible="ASOvervisible" />
   <!-- 录入成绩抽屉 -->
   <entry-scores v-model:Evisible="Evisible" />
   <!-- 查看作业抽屉 -->
   <CKWork v-model:CWvisible="CWvisible"/>
+  <!-- 查看答卷抽屉 -->
+  <CQue v-model:CQvisible="CQvisible"/>
 </template>
 
 <script>
-import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import { toRefs, reactive } from "vue";
+import { message } from 'ant-design-vue';
+import ASOver from "./AllStuOver.vue";
 import CKWork from './CheckWork.vue'
+import CQue from './CheckQue.vue'
 import EntryScores from "./EntryScores.vue";
 import * as api from "../../api/index";
 export default {
@@ -164,7 +143,9 @@ export default {
   components: { 
     EntryScores,
     CKWork,
-   },
+    CQue,
+    ASOver,
+  },
   props: {
     Fvisible: {
       type: Boolean,
@@ -184,16 +165,14 @@ export default {
     const state = reactive({
       Evisible: false, //录入成绩抽屉
       CWvisible: false, //查看作业抽屉
+      CQvisible:false, //查看答卷抽屉
+      ASOvervisible:false, //批量标注完成弹窗
       name: "",
-      showmodal: false, //勾选提示框
-      closable: false, //modal右上角的关闭按钮
       pageNo: 1,
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 100,
-      showdonemodal: false,
+      tableDataTotal: 0,
       open: false,
-      selectedRowKeys: [],
       projectName: "",
       projectNameList: [
         {
@@ -212,7 +191,19 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [],
+      selectedRowKeys: [],
+      tabledata: [
+        {
+          workNum:1,
+          status:"已完成",
+          operation:"",
+        },
+        {
+          workNum:1,
+          status:"未完成",
+          operation:"",
+        }
+      ],
       tablecolumns: [
         {
           title: "工号",
@@ -283,83 +274,122 @@ export default {
     //面授直播管理列表操作
     const ListOpera = () => {
       let arr = state.tabledata;
-      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
       arr.map((value) => {
-        value.operation = (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
+        if(value.status == '已完成'){
+            value.operation = (
             <div
-              class="studentopea1"
-              onClick={() => {
-                state.CWvisible = true
-              }}
-            >  
-              查看作业
-            </div>
-
-            <div
-              class="studentopea2"
-              onClick={() => {
-                console.log( "--------");
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
               }}
             >
-              查看答卷
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    onClick={() => {
+                      state.CWvisible = true
+                    }}
+                >
+                    查看作业
+                </a-button>
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    onClick={() => {
+                    state.CQvisible = true
+                    }}
+                >
+                    查看答卷
+                </a-button>
             </div>
-          </div>
-        );
+          );
+        } else {
+          value.operation = (
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    disabled
+                >
+                    查看作业
+                </a-button>
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    disabled
+                >
+                    查看答卷
+                </a-button>
+            </div>
+          );
+        }
       });
-      state.tabledata = arr;
-      console.log(state.tabledata,'++++++++++++-------------+++++++++-----------+++++++++++++++');
+      // state.tabledata = arr;
     };
     ListOpera();
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-      state.projectName = value;
-    };
     const closeDrawer = () => {
       ctx.emit("update:Fvisible", false);
     };
-    //勾选提示框
-    const showModal = () => {
-      state.showmodal = true;
+    const afterVisibleChange = () => {
+      getManageList()
     };
-    //关闭勾选提示框
-    const closeModal = () => {
-      state.showmodal = false;
+    const selectProjectName = (value) => {
+      state.projectName = value;
     };
-    //点击确认
-    const check = () => {
-      closeModal();
-      return true;
+    const onSelectChange = (selectedRowKeys) => {
+      state.selectedRowKeys = selectedRowKeys;
     };
+    const onSelect = (record) => {
+      console.log(record);
+    }
+
+    const allStuOver = ()=> {
+      state.ASOvervisible = true
+    }
     const showEntryScore = () => {
       state.Evisible = true;
     };
-    const showdoneModal = () => {
-      state.showdonemodal = true;
-    };
-    const closedoneModal = () => {
-      state.showdonemodal = false;
-    };
-    const onSelectChange = (selectedRowKeys) => {
-      console.log("selectedRowKeys changed: ", selectedRowKeys);
-      showModal();
-      // 判断是否点击了确认
-      // let result = check();
-      // if (result) {
-      //   state.selectedRowKeys = selectedRowKeys;
-      // }
-      // state.selectedRowKeys = selectedRowKeys;
-    };
-    const showopen = () => {
-      state.open = true;
+    //催促学员学习
+    const godie = () => {
+      message.destroy()
+      message.success("催促学员成功")
     };
+    //清空所选
+    const clearLine = ()=> {
+      state.selectedRowKeys=[]
+    }
 
+    //渲染列表
+    const getTableDate = (tableData) => {
+      let data = tableData
+      let array = []
+      data.map((value,index) => {
+        let obj = {
+          key : index,
+          workNum : value.workNum,
+          userName : value.userName,
+          deptName : value.deptName,
+          jobName : value.jobName,
+          score : value.score,
+          testscore : value.testscore,
+          status : value.status,
+          operation : "",
+        }
+        array.push(obj)
+      })
+      state.tabledata = array
+    }
     //获取任务管理列表
     const getManageList = () => {
       let obj = {
@@ -376,12 +406,9 @@ export default {
           state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
-          for (let i = 0; i < res.data.data.rows.length; i++) {
-            state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          }
+          getTableDate(res.data.data.rows)
         })
-        .catch((err) => {
-          console.log("获取面授任务列表失败", err);
+        .catch(() => {
         });
     };
 
@@ -410,8 +437,7 @@ export default {
             }
             state.tabledata = newArr;
           })
-          .catch((err) => {
-            console.log("搜索任务列表失败", err);
+          .catch(() => {
           });
       }
     };
@@ -424,35 +450,18 @@ export default {
       getManageList();
     };
 
-    let timer;
-    onMounted(() => {
-      setTimeout(() => {
-       getManageList();
-      }, 1000);
-      timer = setInterval(() => {
-        state.open = false;
-      }, 3000);
-    });
-    onUnmounted(() => {
-      clearInterval(timer);
-    });
-    const ckwork = ()=> {
-      state.CWvisible = true
-    }
     return {
       ...toRefs(state),
-      ckwork,
       selectProjectName,
-      check,
       closeDrawer,
+      afterVisibleChange,
       onSelectChange,
-      showModal,
-      closeModal,
-      ListOpera, //渲染列表操作
+      onSelect,
+      allStuOver,
       showEntryScore,
-      showdoneModal,
-      closedoneModal,
-      showopen,
+      godie,
+      clearLine,
+      getTableDate,
       getManageList,
       searchTaskList,
       resetTaskList,
@@ -462,153 +471,14 @@ export default {
 </script>
 
 <style lang="scss">
-// .drawerStyle {
-//   .ant-drawer-content-wrapper {
-//     // max-width: 1000px;
-//     .ant-drawer-header {
-//       display: none !important;
-//     }
-//     .ant-drawer-body {
-//       padding: 0;
-//     }
-//   }
 
-// }
-
-//面授管理弹窗
-.FacMa {
-  .ant-modal {
-    width: 424px;
-    height: 258px;
-
-    .ant-modal-content {
-      width: 424px;
-      height: 258px;
-
-      .ant-modal-body {
-        width: 424px;
-        height: 258px;
-        padding: 0px;
-
-        .head {
-          width: 424px;
-          height: 68px;
-          // position: absolute;
-          // left: 0;
-          // top: 0;
-          background: linear-gradient(
-            180deg,
-            rgba(78, 166, 255, 0.2) 0%,
-            rgba(78, 166, 255, 0) 100%
-          );
-          display: flex;
-
-          justify-content: center;
-
-          .inhead {
-            width: 90%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-
-            .left {
-              display: flex;
-              align-items: center;
-
-              .gan {
-                width: 16px;
-                height: 16px;
-                background-image: url(../../assets/images/taskpage/gan.png);
-              }
-
-              .tis {
-                margin-left: 5px;
-                width: 32px;
-                font-size: 16px;
-                font-weight: 600;
-                color: #333333;
-              }
-            }
-
-            .right {
-              width: 22px;
-              height: 22px;
-              background-image: url(../../assets/images/basicinfo/close.png);
-              background-size: 100% 100%;
-              cursor: pointer;
-            }
-          }
-        }
-
-        .main {
-          margin-top: 20px;
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          font-size: 14px;
-          font-weight: 400;
-          color: #333333;
-        }
-
-        .butn {
-          width: 100%;
-          display: flex;
-          margin-top: 60px;
-          justify-content: center;
-
-          .btn {
-            width: 100px;
-            height: 40px;
-            border-radius: 4px;
-            cursor: pointer;
-          }
-
-          .btn1 {
-            color: #387df7;
-
-            background: #ffffff;
-            border: 1px solid #387df7;
-          }
-
-          .btn2 {
-            background: #409eff;
-            color: #fff;
-            border: 0;
-            margin-left: 10px;
-          }
-        }
-      }
-    }
-  }
-}
-
-//面授管理弹窗
 .FaceManage {
-  // overflow: auto;
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;
     flex-direction: column;
-    .noticebox {
-      width: 240px;
-      height: 64px;
-      background: rgba(255, 255, 255, 1);
-      border-radius: 4px;
-      position: absolute;
-      top: 161px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      .notext {
-        color: rgba(51, 51, 51, 1);
-        font-size: 14px;
-        font-weight: 500;
-        margin-left: 20px;
-      }
-    }
 
     .header {
       height: 73px;
@@ -616,7 +486,6 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      // background-color: red;
       margin-bottom: 20px;
 
       .headerTitle {
@@ -624,15 +493,12 @@ export default {
         font-weight: 600;
         color: #333333;
         line-height: 25px;
-        // margin-left: 24px;
       }
     }
 
     .main {
       width: 100%;
       height: 100%;
-
-      // background-color: #bfa;
       overflow: auto;
       padding-right: 10px;
       .endtime {
@@ -655,14 +521,6 @@ export default {
           .name {
             margin-top: 8px;
           }
-
-          // .name {
-          //   margin-top: 8px;
-
-          //   color: rgba(0, 0, 0, 0.85);
-          //   font-size: 14px;
-          //   font-weight: 400;
-          // }
         }
 
         .btns {
@@ -770,7 +628,6 @@ export default {
           display: flex;
           justify-content: space-between;
 
-          // background-color: #bfa;
           .left {
             height: 100%;
             display: flex;
@@ -816,9 +673,6 @@ export default {
           padding: 0px !important;
           // padding-left: 45px !important;
         }
-        // .ant-pagination-prev {
-        //   margin-bottom: 5px;
-        // }
         .ant-pagination-item,
         .ant-pagination-prev,
         .ant-pagination-next,
@@ -828,7 +682,6 @@ export default {
         .ant-table-thead > tr > th {
           background-color: rgba(239, 244, 252, 1) !important;
         }
-
         .ant-table-selection-column {
           padding: 0 !important;
         }
@@ -868,15 +721,10 @@ export default {
         }
 
         .pa {
-          // left: 0;
           margin-top: 15px;
           width: 100%;
-          // height: 20px;
-          // background-color: red;
           display: flex;
           justify-content: center;
-          // position: absolute;
-          // bottom: 20px;
         }
       }
     }
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index 86d50e8b..74cdee07 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -21,7 +21,7 @@
               <div class="namecon" style="margin-right: 30px">
                 <div class="name">试卷名称：</div>
                 <a-input
-                  v-model:value="name"
+                  v-model:value="inputPname"
                   style="width: 270px; height: 40px; border-radius: 8px"
                   placeholder="请输入试卷名称或序号"
                 />
@@ -29,7 +29,7 @@
               <div class="namecon" style="margin-right: 30px">
                 <div class="name">创建人：</div>
                 <a-input
-                  v-model:value="name"
+                  v-model:value="inputCname"
                   style="width: 240px; height: 40px; border-radius: 8px"
                   placeholder="请输入创建人"
                 />
@@ -59,11 +59,10 @@
             <a-table
               style="border: 1px solid #f2f6fe"
               :columns="tableDataFunc()"
-              :data-source="tabledata"
+              :data-source="tableData"
               :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
+              :row-selection="{selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}"
               :scroll="{ x: 900 }"
-              @expand="expandTable"
               :pagination="false"
             />
             <div class="tableBox">
@@ -84,15 +83,16 @@
         </div>
         <div class="btnn">
           <button class="btn1">取消</button>
-          <button class="btn2">确定</button>
+          <button class="btn2" @click="CreatSTText()">确定</button>
         </div>
       </div>
     </a-drawer>
   </template>
   
   <script>
-  import { toRefs, reactive, onMounted } from "vue";
-  import * as api from "../../api/index";
+  import { toRefs, reactive } from "vue";
+  import * as api from "../../api/indexTest";
+  import { message } from 'ant-design-vue';
   export default {
     name: "STest",
     props: {
@@ -104,62 +104,72 @@
   
     setup(props, ctx) {
       const state = reactive({
-        name: "",
+        inputPname: "",
+        inputCname: "",
         pageNo: 1,
         pageSize: 10,
         currentPage: 1,
         tableDataTotal: 0,
         projectName: "",
-        tabledata: [],
+        tableData: [],
+        selectedRowKeys:[],
+        //需要传给父亲的参数
+        SelectTestData:{},
+
       });
+      //点击确认后执行此方法将参数传给父亲
+      const CreatSTText = ()=> {
+       ctx.emit('getSTData',state.SelectTestData)
+        closeDrawer()
+      }
+      const closeDrawer = () => {
+        ctx.emit("update:STvisible", false);
+      };
+
+      const afterVisibleChange = () => {
+          getManageList()
+      };
+
       const tableDataFunc = ()=> {
         {
             const columns =  [
                 {
-                  title: "工号",
-                  dataIndex: "workNum",
-                  key: "workNum",
-                  width: 50,
+                  title: "序号",
+                  dataIndex: "paperId",
+                  key: "paperId",
+                  width: 90,
                   align: "center",
                   className: "h head",
                 },
                 {
-                  title: "姓名",
-                  dataIndex: "userName",
-                  key: "userName",
-                  width: 50,
+                  title: "试卷名称",
+                  dataIndex: "testName",
+                  key: "testName",
+                  width: 110,
                   align: "center",
                   className: "h head",
                 },
                 {
-                  title: "所在部门",
-                  dataIndex: "deptName",
-                  key: "userName",
-                  width: 60,
+                  title: "随机模式",
+                  dataIndex: "paperMode",
+                  key: "paperMode",
+                  width: 110,
                   align: "center",
                   className: "h",
                 },
                 {
-                  title: "所在岗位",
-                  dataIndex: "jobName",
-                  key: "jobName",
-                  width: 60,
+                  title: "创建人",
+                  dataIndex: "sysCreateBy",
+                  key: "sysCreateBy",
+                  width: 90,
                   align: "center",
                   className: "h",
                 },
                 {
-                  title: "完成时间",
-                  dataIndex: "time",
-                  key: "time",
-                  width: 100,
-                  align: "center",
-                  className: "h",
-                },
-                {
-                  title: "任务状态",
-                  dataIndex: "status",
-                  key: "status",
-                  width: 60,
+                  title: "最近更新时间",
+                  dataIndex: "sysUpdateTime",
+                  key: "sysUpdateTime",
+                  width: 150,
                   align: "center",
                   className: "h",
                 },
@@ -167,38 +177,58 @@
             return columns;
         } 
       };
-      const closeDrawer = () => {
-        ctx.emit("update:STvisible", false);
-      };
+
       const onChange = (pageNumber) => {
         console.log("Page: ", pageNumber);
       };
-      const newTest = ()=> {
-        console.log('111');
+
+      const onSelect = (record) => {
+        state.SelectTestData = record
+      };
+      const onSelectChange = (selectedRowKeys) => {
+        state.selectedRowKeys = selectedRowKeys;
       }
+
+      const newTest = ()=> {
+        console.log('创建考试没设计图');
+      }
+      const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        let obj = {
+          key: index+1,
+          sysCreateBy: value.sysCreateBy,
+          paperId: value.paperId,
+          testName:value.testName,
+          paperMode:value.paperMode,
+          sysUpdateTime: value.sysUpdateTime,
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+    };
       //获取任务管理列表
       const getManageList = () => {
         let obj = {
-          name: "",
-          pageNo: state.pageNo,
-          pageSize: state.pageSize,
-          projectId: 27,
-          projectTaskId: 370,
-        //   projectTaskId: props.projectTaskId,
-          status: -1,
+          // "keyWord": "",
+          // "pageIndex": 0,
+          // "pageSize": 0,
+          // "published": true,
+          "keyWord": "",
+          "orderAsc": true,
+          "orderFiled": "",
+          "pageIndex": 0,
+          "pageSize": 0
         };
         api
-          .taskStudentList(obj)
+          .queryExaminationPaper(obj)
           .then((res) => {
-            state.pageNo = res.data.data.pageNo;
-            state.pageSize = res.data.data.pageSize;
-            state.pageSize = res.data.data.pageSize;
-            for (let i = 0; i < res.data.data.rows.length; i++) {
-              state.tabledata.push(res.data.data.rows[i].userInfoBo);
-            }
+            getTableDate(res.data.data)
           })
-          .catch((err) => {
-            console.log("获取时间任务列表失败cc", err);
+          .catch(() => {
+            message.destroy()
+            message.error("获取选择考试列表失败")
           });
       };
   
@@ -227,8 +257,7 @@
               }
               state.tabledata = newArr;
             })
-            .catch((err) => {
-              console.log("搜索任务列表失败", err);
+            .catch(() => {
             });
         }
       };
@@ -240,17 +269,16 @@
         state.tabledata = [];
         getManageList();
       };
-      onMounted(() => {
-        setTimeout(() => {
-          getManageList();
-        }, 500);
-      });
       return {
         ...toRefs(state),
         closeDrawer,
+        afterVisibleChange,
+        getTableDate,
+        onSelect,
+        onSelectChange,
+        CreatSTText,
         newTest,
         tableDataFunc,
-        onMounted,
         onChange,
         getManageList,
         searchTaskList,
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 6cafdba1..a172bd43 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -60,7 +60,7 @@
         <div class="btnss" style="margin-top: 20px">
           <div
             class="btn btn1"
-            @click="showopen"
+            @click="godie"
             style="margin-right: 20px; cursor: pointer"
           >
             <div class="img2"></div>
@@ -72,16 +72,39 @@
           </div>
         </div>
         <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
-          <a-table
-            style="border: 1px solid #f2f6fe"
-            :columns="tableDataFunc()"
-            :data-source="tabledata"
-            :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            :scroll="{ x: 900 }"
-            @expand="expandTable"
-            :pagination="false"
-          />
+            <!-- <a-table 
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tabledata"
+              :loading="tableDataTotal === -1 ? true : false"
+              :scroll="{ x: 900 }"
+              :pagination="false"
+            /> -->
+          <div v-if="itemsType == 5">
+            <a-table 
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tabledata"
+              :row-selection="{ 
+                selectedRowKeys:selectedRowKeys,
+                onChange:onSelectChange, 
+                onSelect:onSelect,
+                }"
+              :loading="tableDataTotal === -1 ? true : false"
+              :scroll="{ x: 900 }"
+              :pagination="false"
+            />
+          </div>
+          <div v-if="itemsType == 10">
+            <a-table 
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tabledata"
+              :loading="tableDataTotal === -1 ? true : false"
+              :scroll="{ x: 900 }"
+              :pagination="false"
+            />
+          </div>
           <div class="tableBox">
             <div class="pa">
               <a-pagination
@@ -102,16 +125,13 @@
         <button class="btn1">取消</button>
         <button class="btn2">确定</button>
       </div>
-      <div class="noticebox" v-show="open">
-        <div><img src="../../assets/images/taskpage/check.png" /></div>
-        <div class="notext">催促学员成功</div>
-      </div>
     </div>
   </a-drawer>
 </template>
 
 <script>
-import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import { toRefs, reactive } from "vue";
+import { message } from 'ant-design-vue';
 import * as api from "../../api/index";
 export default {
   name: "TestManage",
@@ -160,7 +180,19 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [],
+      tabledata: [       
+        {
+          workNum:1,
+          status:"已完成",
+          operation:"",
+        },
+        {
+          workNum:1,
+          status:"未完成",
+          operation:"",
+        }
+      ],
+      selectedRowKeys:[],
     });
     const tableDataFunc = () => {
       if(props.itemsType == 10){
@@ -303,48 +335,103 @@ export default {
 
 
     };
-    //考试、测评管理列表操作
+    //考试管理列表操作
     const ListOpera = () => {
       let arr = state.tabledata;
-      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
-      arr.map((value) => {
-        value.operation = (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
+      if(props.itemsType == 5){
+        arr.map((value) => {
+          if(value.status == '已完成'){
+            value.operation = (
             <div
-              class="operation"
-              onClick={() => {
-                console.log(state.tabledata,'++++++++++++');
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
               }}
-            >  
-              查看
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    onClick={() => {
+                      console.log('123')
+                    }}
+                >
+                    查看
+                </a-button>
             </div>
-          </div>
-        );
-      });
-      state.tabledata = arr;
-      console.log(state.tabledata,'-----------');
+          );
+        } else {
+          value.operation = (
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    disabled
+                >
+                    查看
+                </a-button>
+            </div>
+          );
+        }
+        })
+      }
     };
     ListOpera();
+    const onSelect = (record) => {
+      console.log(record);
+    }
+    const onSelectChange = (selectRowKeys) => {
+      state.selectedRowKeys = selectRowKeys
+    }
+    const closeDrawer = () => {
+      ctx.emit("update:TMvisible", false);
+    };
+    const afterVisibleChange = () => {
+        getManageList();
+    };
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       state.projectName = value;
     };
-    const closeDrawer = () => {
-      ctx.emit("update:TMvisible", false);
-    };
-    const showopen = () => {
-      state.open = true;
+    //催促
+    const godie = () => {
+      message.destroy()
+      message.success("催促考试成功")
     };
+    //换页
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
 
+    //渲染列表
+    const getTableDate = (tableData) => {
+      let data = tableData
+      let array = []
+      data.map((item,index)=>{
+        let obj = {
+          key : index+1,
+          workNum : item.workNum,
+          userName : item.userName,
+          deptName : item.deptName,
+          jobName : item.jobName,
+          testNum : item.testNum,
+          score : item.score,
+          time : item.time,
+          status : "已完成",
+          operation:"",
+        }
+        array.push(obj)
+      })
+      state.tabledata = array
+    }
     //获取任务管理列表
     const getManageList = () => {
       let obj = {
@@ -361,9 +448,7 @@ export default {
           state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
-          for (let i = 0; i < res.data.data.rows.length; i++) {
-            state.tabledata.push(res.data.data.rows[i].userInfoBo);
-          }
+          getTableDate(res.data.data.rows)
         })
         .catch((err) => {
           console.log("获取测试任务列表失败", err);
@@ -407,28 +492,15 @@ export default {
       state.tabledata = [];
       getManageList();
     };
-
-    let timer;
-    onMounted(() => {
-      setTimeout(() => {
-        getManageList();
-      }, 1000);
-      
-      timer = setInterval(() => {
-        state.open = false;
-      }, 3000);
-    });
-    onUnmounted(() => {
-      clearInterval(timer);
-    });
     return {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      afterVisibleChange,
       tableDataFunc,
-      showopen,
-      onMounted,
-      onUnmounted,
+      onSelect,
+      onSelectChange,
+      godie,
       onChange,
       getManageList,
       searchTaskList,
@@ -589,6 +661,10 @@ export default {
         }
       }
       .tab {
+        .ant-table-thead{
+          background-color: #eff4fc !important;
+        }
+
         th.h {
           background-color: #eff4fc !important;
         }
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 524d3fa2..68da73b2 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -58,7 +58,7 @@
           </div>
         </div>
         <div class="btnss" style="margin-top: 20px">
-          <div class="btn btn1" @click="showopen" style="margin-right: 20px">
+          <div class="btn btn1" @click="godie" style="margin-right: 20px">
             <div class="img1"></div>
             <div class="wz">催促学习</div>
           </div>
@@ -73,9 +73,7 @@
             :columns="tableDataFunc()"
             :data-source="tabledata"
             :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
             :scroll="{ x: 900 }"
-            @expand="expandTable"
             :pagination="false"
           />
           <div class="tableBox">
@@ -95,13 +93,9 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1" @click="test()">取消</button>
+        <button class="btn1">取消</button>
         <button class="btn2">确定</button>
       </div>
-      <div class="noticebox" v-show="open">
-        <div><img src="../../assets/images/taskpage/check.png" /></div>
-        <div class="notext">催促学员成功</div>
-      </div>
       <CVote v-model:CVvisible="CVvisible"/>
     </div>
   </a-drawer>
@@ -109,6 +103,7 @@
 
 <script>
 import { toRefs, reactive, onMounted, onUnmounted } from "vue";
+import { message } from 'ant-design-vue';
 import CVote from "./CheckVote.vue"
 import * as api from "../../api/index";
 export default {
@@ -163,7 +158,18 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [],
+      tabledata: [
+        {
+          workNum:1,
+          status:"已完成",
+          operation:"",
+        },
+        {
+          workNum:2,
+          status:"未完成",
+          operation:"",
+        },
+      ],
     });
     const tableDataFunc = ()=> {
       if(
@@ -290,40 +296,65 @@ export default {
     //在线投票等管理列表操作
     const ListOpera = () => {
       let arr = state.tabledata;
-      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
       arr.map((value) => {
-        value.operation = (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
+        if(value.status == '已完成'){
+            value.operation = (
             <div
-              class="operation"
-              onClick={() => {
-                state.CVvisible = true;
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
               }}
-            >  
-              查看
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    onClick={() => {
+                      state.CVvisible = true;
+                    }}
+                >
+                    查看
+                </a-button>
             </div>
-          </div>
-        );
+          );
+        } else {
+          value.operation = (
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    disabled
+                >
+                    查看
+                </a-button>
+            </div>
+          );
+        }
       });
       state.tabledata = arr;
-      console.log(state.tabledata,'-----------');
     };
     ListOpera();
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-      state.projectName = value;
-    };
     const closeDrawer = () => {
       ctx.emit("update:Tvisible", false);
     };
-    const showopen = () => {
-      state.open = true;
+    const afterVisibleChange = () => {
+        getManageList();
+    };
+    const selectProjectName = (value) => {
+      state.projectName = value;
+    };
+    //催促
+    const godie = () => {
+      message.destroy()
+      message.success("催促学习成功")
     };
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
@@ -335,7 +366,6 @@ export default {
         pageNo: state.pageNo,
         pageSize: state.pageSize,
         projectId: 27,
-        // projectTaskId: 370,
         projectTaskId: props.projectTaskId,
         status: -1,
       };
@@ -349,8 +379,7 @@ export default {
             state.tabledata.push(res.data.data.rows[i].userInfoBo);
           }
         })
-        .catch((err) => {
-          console.log("获取时间任务列表失败cc", err);
+        .catch(() => {
         });
     };
 
@@ -391,28 +420,13 @@ export default {
       state.tabledata = [];
       getManageList();
     };
-    const test = ()=> {
-      state.CVvisible = true
-    }
-    let timer;
-    onMounted(() => {
-      setTimeout(() => {
-        getManageList();
-      }, 500);
-      timer = setInterval(() => {
-        state.open = false;
-      }, 3000);
-    });
-    onUnmounted(() => {
-      clearInterval(timer);
-    });
     return {
-      test,
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      afterVisibleChange,
       tableDataFunc,
-      showopen,
+      godie,
       onMounted,
       onUnmounted,
       onChange,
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index 85c48a20..21afcbe8 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -112,7 +112,8 @@
 </template>
 
 <script>
-import { toRefs, reactive, onMounted } from "vue";
+import { toRefs, reactive } from "vue";
+import { message } from 'ant-design-vue';
 import EHWork from "./ExportHWork.vue"
 import EScore from "./ExportScore.vue"
 import WorkDetail from "../drawers/WorkDetail.vue";
@@ -148,7 +149,7 @@ export default {
       pageNo: 1,
       pageSize: 10,
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       projectName: "",
       projectNameList: [
         {
@@ -167,7 +168,18 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [],
+      tabledata: [
+        {
+          workNum:1,
+          status:"已完成",
+          operation:"",
+        },
+        {
+          workNum:2,
+          status:"未完成",
+          operation:"",
+        },
+      ],
       tablecolumns: [
         {
           title: "工号",
@@ -238,38 +250,61 @@ export default {
     //作业管理列表操作
     const ListOpera = () => {
       let arr = state.tabledata;
-      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
       arr.map((value) => {
-        value.operation = (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              justifyContent: "center",
-            }}
-          >
+        if(value.status == '已完成'){
+            value.operation = (
             <div
-              class="operation"
-              onClick={() => {
-                console.log(state.tabledata,'++++++++++++');
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
               }}
-            >  
-              查看
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    onClick={() => {
+                      state.WDvisible = true;
+                    }}
+                >
+                    查看
+                </a-button>
             </div>
-          </div>
-        );
+          );
+        } else {
+          value.operation = (
+            <div
+              style={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+                <a-button 
+                    type="link"
+                    class="operation"
+                    style="cursor:pointer;margin-right:10px;"
+                    disabled
+                >
+                    查看
+                </a-button>
+            </div>
+          );
+        }
       });
       state.tabledata = arr;
-      console.log(state.tabledata,'-----------');
     };
     ListOpera();
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-      state.projectName = value;
-    };
     const closeDrawer = () => {
       ctx.emit("update:Wvisible", false);
     };
+    const afterVisibleChange = () => {
+      getManageList();
+    };
+    const selectProjectName = (value) => {
+      state.projectName = value;
+    };
     const showEHWorkModal = () => {
       state.exportHWorkvisible = true;
     };
@@ -303,8 +338,7 @@ export default {
             state.tabledata.push(res.data.data.rows[i].userInfoBo);
           }
         })
-        .catch((err) => {
-          console.log("获取作业任务列表失败", err);
+        .catch(() => {
         });
     };
 
@@ -332,8 +366,9 @@ export default {
             }
             state.tabledata = newArr;
           })
-          .catch((err) => {
-            console.log("搜索任务列表失败", err);
+          .catch(() => {
+            message.destroy()
+            message.error("搜索任务列表失败")
           });
       }
     };
@@ -346,15 +381,11 @@ export default {
       getManageList();
     };
 
-    onMounted(() => {
-      setTimeout(() => {
-       getManageList();
-      }, 1000);
-    });
     return {
       ...toRefs(state),
       selectProjectName,
       closeDrawer,
+      afterVisibleChange,
       showEHWorkModal,
       showEScoreModal,
       showWorkDetail,
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 2859cfaa..f6fada13 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -368,8 +368,6 @@
                     v-for="(item, key) in value.taskList"
                     :key="key"
                   >
-                    <!-- :style="{width:item.course==='在线'?'28px':
-												height:item.course==='在线'?'27px':}" -->
                     <div class="first">
                       <div class="icon">
                         <div
@@ -421,7 +419,6 @@
                       <div
                         :class="item.flag == true ? 'typename1' : 'typename'"
                       >
-                        <!-- {{ item.classify }}  -->
                         <span v-if="item.flag">必修</span>
                         <span v-else>选修</span>
                       </div>
@@ -477,7 +474,6 @@
                         style="cursor: pointer"
                         @click="showCodeModal"
                       >
-                        <!-- 我的@click=" showCopyModal(item.type)" -->
                         二维码
                       </div>
                       <div
@@ -1079,16 +1075,14 @@
     </div>
     <!-- 时间管理抽屉 -->
     <time-manage
-      v-model:Tvisible.sync="visible"
-      v-if="visible"
+      v-model:Tvisible="visible"
       :projectTaskId="projectTaskId"
       :title="showTimeText"
       :itemsType="itemstype"
     />
     <!-- 面授管理抽屉 -->
     <face-manage
-      v-model:Fvisible.sync="FaceVisivle"
-      v-if="FaceVisivle"
+      v-model:Fvisible="FaceVisivle"
       :projectTaskId="projectTaskId"
       :title="showFaceText"
     />
@@ -1125,15 +1119,13 @@
     <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
     <work-manage
-      v-model:Wvisible.sync="Wvisible"
-      v-if="Wvisible"
+      v-model:Wvisible="Wvisible"
       :projectTaskId="projectTaskId"
       :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
     <test-manage
-      v-model:TMvisible.sync="TMvisible"
-      v-if="TMvisible"
+      v-model:TMvisible="TMvisible"
       :title="showTestText"
       :projectTaskId="projectTaskId"
       :itemsType="itemstype"
@@ -1423,45 +1415,7 @@
       </a-modal>
     </div>
     <!-- 删除弹窗 -->
-    <!-- 管理二维码 -->
-    <a-modal
-      v-model:visible="copyModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="facemanageModal"
-      centered="true"
-    >
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span v-if="QRtype == '1'">在线管理</span>
-            <span v-if="QRtype == '2'">面授管理</span>
-            <span v-if="QRtype == '3'">案例管理</span>
-            <span v-if="QRtype == '4'">作业管理</span>
-            <span v-if="QRtype == '5'">考试管理</span>
-            <span v-if="QRtype == '6'">直播管理</span>
-            <span v-if="QRtype == '7'">外链管理</span>
-            <span v-if="QRtype == '8'">讨论管理</span>
-            <span v-if="QRtype == '9'">活动管理</span>
-            <span v-if="QRtype == '10'">测评管理</span>
-            <span v-if="QRtype == '11'">评估管理</span>
-            <span v-if="QRtype == '12'">投票管理</span>
-            <div class="close_exit" @click="closeCopyModal"></div>
-          </div>
-          <div class="body">
-            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
-          </div>
-          <div class="footerr">
-            <div class="onload">下载二维码</div>
-            <div class="onloadpx">200*200</div>
-            <div class="onloadpx">400*400</div>
-            <div class="onloadpx">800*800</div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
+
     <!-- 批量删除弹窗 -->
     <div>
       <a-modal
@@ -1720,7 +1674,6 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
   name: "taskPage",
   components: {
-    // CaretRightOutlined,
     TimeManage,
     FaceManage,
     SubsetManage,
@@ -1847,10 +1800,8 @@ export default {
       Changevisible: false, //学员换组
       editHs: false, //编辑弹窗
       delete_hs: false, //删除弹窗
-      copyModal: false, //面授二维码弹窗
       closeCopy: false, //面授二维码关闭图标
       zhibModal: false, //直播二维码弹窗
-      QRtype: "", //二维码标题
       huodModal: false, //活动二维码弹窗
       allDelete: false, //批量删除弹窗
 
@@ -2308,45 +2259,6 @@ export default {
         //     },
         //   ],
         // },
-        // {
-        //   text: "阶段2腾飞班阶段2",
-        //   children: [
-        //     {
-        //       course: "讨论",
-        //       name: "时间管理",
-        //       classify: "选修",
-        //       beginTime: "2022-09-16 14:03",
-        //       total: 50, //总人数
-        //       complete: 20, //完成人数
-        //       percent: 40,
-        //     },
-        //     {
-        //       course: "测评",
-        //       name: "管理直播间",
-        //       classify: "必修",
-        //       beginTime: "2022-09-16 14:03",
-        //       total: 50, //总人数
-        //       complete: 10, //完成人数
-        //       percent: 20,
-        //     },
-        //     {
-        //       course: "调研",
-        //       name: "管理直播间",
-        //       classify: "必修",
-        //       beginTime: "2022-09-16 14:03",
-        //       total: 50, //总人数
-        //       complete: 10, //完成人数
-        //       percent: 20,
-        //     },
-        //     {
-        //       course: "投票",
-        //       name: "管理直播间",
-        //       classify: "必修",
-        //       beginTime: "2022-09-16 14:03",
-        //       total: 50, //总人数
-        //       complete: 10, //完成人数
-        //       percent: 20,
-        //     },
         //   ],
         // },
       ],
@@ -2620,37 +2532,6 @@ export default {
         state.stugroup = false;
       }
     };
-    const showCopyModal = (itemtype) => {
-      state.copyModal = true;
-      if (itemtype == "1") {
-        state.QRtype = "1";
-      } else if (itemtype == "2") {
-        state.QRtype = "2";
-      } else if (itemtype == "3") {
-        state.QRtype = "3";
-      } else if (itemtype == "4") {
-        state.QRtype = "4";
-      } else if (itemtype == "5") {
-        state.QRtype = "5";
-      } else if (itemtype == "6") {
-        state.QRtype = "6";
-      } else if (itemtype == "7") {
-        state.QRtype = "7";
-      } else if (itemtype == "8") {
-        state.QRtype = "8";
-      } else if (itemtype == "9") {
-        state.QRtype = "9";
-      } else if (itemtype == "10") {
-        state.QRtype = "10";
-      } else if (itemtype == "11") {
-        state.QRtype = "11";
-      } else if (itemtype == "12") {
-        state.QRtype = "12";
-      }
-    };
-    const closeCopyModal = () => {
-      state.copyModal = false;
-    };
     const showFaceIn = () => {
       state.TaskFaceImpStuvisible = true;
     };
@@ -3667,8 +3548,6 @@ export default {
       closeModal3,
       showDeleteOne,
       closeDeleteOne,
-      showCopyModal,
-      closeCopyModal,
       showTime,
       showFace,
       showSubset,
@@ -3724,7 +3603,6 @@ export default {
       createG,
       resetGroupName,
       searchGroup,
-      // studentData,
       cancelyou,
       cancelcanyou,
       changePaginationStu,
@@ -4549,121 +4427,6 @@ export default {
   }
 }
 
-.facemanageModal {
-  .ant-modal {
-    width: 532px !important;
-    height: 428px !important;
-
-    .ant-modal-content {
-      width: 532px !important;
-      height: 428px !important;
-
-      .ant-modal-body {
-        width: 532px !important;
-        height: 428px !important;
-        padding: 0 !important;
-
-        .delete {
-          z-index: 999;
-          width: 532px;
-          height: 428px;
-          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/coursewareManage/QR.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;
-              }
-            }
-
-            .footerr {
-              display: flex;
-              justify-content: center;
-              align-items: center;
-
-              .onload {
-                color: rgba(51, 51, 51, 1);
-                font-size: 14px;
-              }
-
-              .onloadpx {
-                width: 80px;
-                height: 32px;
-                border: 1px solid rgba(56, 125, 247, 1);
-                border-radius: 4px;
-                color: rgba(56, 125, 247, 1);
-                margin-left: 20px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                cursor: pointer;
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 .taskpage {
   width: 100%;
   display: flex;
diff --git a/vue.config.js b/vue.config.js
index 278c0e97..dc5c008b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@ module.exports = defineConfig({
     port:8080,
     proxy: {
       "/api": {
-        // target: "http://192.168.100.208:30019/",
+        // target:"http://192.168.100.208:30001",
         target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
         changeOrigin: true, //表示是否改变原域名
         // secure: false,

From e163cd5003eb20743e2a3daf96059fe2690c5e60 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 21 Nov 2022 15:10:55 +0800
Subject: [PATCH 76/90] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                       |   5 +-
 src/api/index1.js                      |   9 +-
 src/components/NavLeft.vue             |  66 ++++----
 src/components/OpenPages.vue           | 217 +++++++++++++------------
 src/router/config.js                   |  11 +-
 src/router/index.js                    |  14 +-
 src/store/index.js                     |   4 +-
 src/views/projectcenter/ProjectAdd.vue |  12 +-
 src/views/projectcenter/TaskAdd.vue    |   2 +
 9 files changed, 184 insertions(+), 156 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 919f540b..45195084 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-20 17:45:37
+ * @LastEditTime: 2022-11-20 18:18:11
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -69,5 +69,8 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail',
 
 //获取模版列表
 export const getTemplate = (obj) => http.post('/admin/project/template/list', obj)
+//获取模版详细信息
+export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', { params: obj })
+
 //获取项目统计
 export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
\ No newline at end of file
diff --git a/src/api/index1.js b/src/api/index1.js
index 0b26f574..87fa03e2 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-20 15:39:38
+ * @LastEditTime: 2022-11-21 11:51:11
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -33,6 +33,7 @@ import qs from 'qs';
  * （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'）
  * let data = {"code":"1234","name":"yyyy"};
  * axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then()
+ * 
  *
  * 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。
  * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
@@ -55,8 +56,7 @@ export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
 export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj);
 //获取路径图统计数据
 export const getLearnCount = (routerId) => http.get('/admin/router/getCount', { params: { routerId: routerId } })
-//获取关卡
-export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });
+
 
 //新建或编辑关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
@@ -89,7 +89,8 @@ export const billboard = (obj) => http.post('/admin/project/billboard', obj);
 // 获取组织结构树
 export const orgtree = () => http.get('/org/tree');
 
-
+//获取积分列表
+export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``)
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 5f84d414..87f64f4b 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -44,7 +44,7 @@
                 circle: selectedKeys[0] === 'sub10-1' ? false : true,
               }"
             ></span>
-            <router-link to="/coursereviewedn">待审核课程</router-link>
+            <router-link to="/manage/coursereviewedn">待审核课程</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-2">
             <span
@@ -53,7 +53,7 @@
                 circle: selectedKeys[0] === 'sub10-2' ? false : true,
               }"
             ></span>
-            <router-link to="/coursereviewed">已审核课程</router-link>
+            <router-link to="/manage/coursereviewed">已审核课程</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-3">
             <span
@@ -62,7 +62,7 @@
                 circle: selectedKeys[0] === 'sub10-3' ? false : true,
               }"
             ></span>
-            <router-link to="/projectreviewedn">待审核项目</router-link>
+            <router-link to="/manage/projectreviewedn">待审核项目</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-4">
             <span
@@ -71,7 +71,7 @@
                 circle: selectedKeys[0] === 'sub10-4' ? false : true,
               }"
             ></span>
-            <router-link to="/projectreviewed">已审核项目</router-link>
+            <router-link to="/manage/projectreviewed">已审核项目</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -82,7 +82,7 @@
               src="../assets/images/navleft/studyPath.png"
             />
           </div>
-          <router-link to="/learningpath">学习路径</router-link>
+          <router-link to="/manage/learningpath">学习路径</router-link>
         </a-menu-item>
 
         <a-sub-menu key="sub2" @titleClick="titleClick">
@@ -102,7 +102,7 @@
                 circle: selectedKeys[0] === 'sub2-1' ? false : true,
               }"
             ></span>
-            <router-link to="/projectmanage">项目</router-link>
+            <router-link to="/manage/projectmanage">项目</router-link>
           </a-menu-item>
           <a-menu-item key="sub2-2">
             <span
@@ -111,7 +111,7 @@
                 circle: selectedKeys[0] === 'sub2-2' ? false : true,
               }"
             ></span>
-            <router-link to="/templatelibrary">模板库</router-link>
+            <router-link to="/manage/templatelibrary">模板库</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -132,7 +132,7 @@
                 circle: selectedKeys[0] === 'sub3-1' ? false : true,
               }"
             ></span>
-            <router-link to="/coursemanage">课件管理</router-link>
+            <router-link to="/manage/coursemanage">课件管理</router-link>
           </a-menu-item>
           <a-menu-item key="sub3-2">
             <span
@@ -141,7 +141,7 @@
                 circle: selectedKeys[0] === 'sub3-2' ? false : true,
               }"
             ></span>
-            <router-link to="/coursewaremanage">课程管理</router-link>
+            <router-link to="/manage/coursewaremanage">课程管理</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -162,7 +162,7 @@
               src="../assets/images/navleft/survey.png"
             />
           </div>
-          <router-link to="/researchmanage">评估管理</router-link>
+          <router-link to="/manage/researchmanage">评估管理</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub6" @titleClick="titleClick">
@@ -193,7 +193,7 @@
             />
           </div>
 
-          <router-link to="/certificatecenter">证书中心</router-link>
+          <router-link to="/manage/certificatecenter">证书中心</router-link>
         </a-menu-item>
         <a-menu-item key="sub9" @titleClick="titleClick">
           <div class="imgBox">
@@ -202,7 +202,7 @@
               src="../assets/images/navleft/system.png"
             />
           </div>
-          <router-link to="/systemmanage">系统管理</router-link>
+          <router-link to="/manage/systemmanage">系统管理</router-link>
         </a-menu-item>
       </a-menu>
     </div>
@@ -220,15 +220,15 @@
         @click="handleClick"
       >
         <a-menu-item key="sub1" @titleClick="titleClick">
-          <router-link to="/learningpath">学习</router-link>
+          <router-link to="/manage/learningpath">学习</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub2" @titleClick="titleClick">
-          <router-link to="/projectmanage">项目</router-link>
+          <router-link to="/manage/projectmanage">项目</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub3" @titleClick="titleClick">
-          <router-link to="/coursewaremanage">课程</router-link>
+          <router-link to="/manage/coursewaremanage">课程</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub4" @titleClick="titleClick">
@@ -295,104 +295,104 @@ export default {
 
       keysList: [
         {
-          href: "/coursereviewedn",
+          href: "/manage/coursereviewedn",
           openKeys: "sub10",
           selectedKeys: "sub10-1",
           pagename: "待审核课程",
         },
         {
-          href: "/coursereviewed",
+          href: "/manage/coursereviewed",
           openKeys: "sub10",
           selectedKeys: "sub10-2",
           pagename: "已审核课程",
         },
         {
-          href: "/projectreviewedn",
+          href: "/manage/projectreviewedn",
           openKeys: "sub10",
           selectedKeys: "sub10-3",
           pagename: "待审核项目",
         },
         {
-          href: "/projectrrviewed",
+          href: "/manage/projectrrviewed",
           openKeys: "sub10",
           selectedKeys: "sub10-4",
           pagename: "已审核项目",
         },
         {
-          href: "/learningpath",
+          href: "/manage/learningpath",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "学习路径",
         },
         {
-          href: "/leveladd",
+          href: "/manage/leveladd",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "关卡",
         },
         {
-          href: "/levelcheck",
+          href: "/manage/levelcheck",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "查看",
         },
         {
-          href: "/leveladddetail",
+          href: "/manage/leveladddetail",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "创建关卡",
         },
         {
-          href: "/projectmanage",
+          href: "/manage/projectmanage",
           openKeys: "sub2",
           selectedKeys: "sub2-1",
           pagename: "项目",
         },
         {
-          href: "/projectadd",
+          href: "/manage/projectadd",
           openKeys: "sub2",
           selectedKeys: "sub2-1",
           pagename: "创建项目",
         },
         {
-          href: "/templatelibrary",
+          href: "/manage/templatelibrary",
           openKeys: "sub2",
           selectedKeys: "sub2-2",
           pagename: "模板库",
         },
         {
-          href: "/libraryadd",
+          href: "/manage/libraryadd",
           openKeys: "sub2",
           selectedKeys: "sub2-2",
           pagename: "查看",
         },
         {
-          href: "/coursemanage",
+          href: "/manage/coursemanage",
           openKeys: "sub3",
           selectedKeys: "sub3-1",
           pagename: "课件管理",
         },
         {
-          href: "/coursewaremanage",
+          href: "/manage/coursewaremanage",
           openKeys: "sub3",
           selectedKeys: "sub3-2",
           pagename: "课程管理",
         },
         {
-          href: "/certificatecenter",
+          href: "/manage/certificatecenter",
           openKeys: "sub8",
           selectedKeys: "sub8",
           pagename: "证书中心",
         },
 
         {
-          href: "/systemmanage",
+          href: "/manage/systemmanage",
           openKeys: "sub9",
           selectedKeys: "sub9",
           pagename: "系统管理",
         },
         {
-          href: "/researchmanage",
+          href: "/manage/researchmanage",
           openKeys: "sub5",
           selectedKeys: "sub5",
           pagename: "评估管理",
@@ -434,7 +434,7 @@ export default {
     watch(
       () => route.fullPath,
       (n) => {
-        console.log("监听路由", n, store.state.openpages);
+        console.log("监听路由", n, store.state.openpages, state.keysList);
         // console.log("new:" + n.toLowerCase() + ",old:" + o);
         let arr = state.keysList;
         arr.map((value) => {
diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue
index f8c24091..96fd7655 100644
--- a/src/components/OpenPages.vue
+++ b/src/components/OpenPages.vue
@@ -1,25 +1,40 @@
 <template>
-	<div class="openPages">
-		<draggable v-model="openList" chosenClass="chosen" forceFallback="true" ghostClass="ghost" group="openPage"
-			animation="500" @start="onStart" @end="onEnd" style="display: flex">
-			<template #item="{ element }">
-				<div style="position: relative">
-					<router-link :to="element.href" class="openItems" :style="{ background: element.active ? '#f5f7fa' : '' }">
-						<div :style="{
-							color: element.active
-								? 'rgba(64, 158, 255, 1)'
-								: 'rgba(135, 139, 146, 1)',
-						}">
-							{{ element.pagename }}
-						</div>
-					</router-link>
-					<div class="close" @click.stop="closePage(element)">
-						<img src="../assets/images/openPages/close.png" />
-					</div>
-				</div>
-			</template>
-		</draggable>
-	</div>
+  <div class="openPages">
+    <draggable
+      v-model="openList"
+      chosenClass="chosen"
+      forceFallback="true"
+      ghostClass="ghost"
+      group="openPage"
+      animation="500"
+      @start="onStart"
+      @end="onEnd"
+      style="display: flex"
+    >
+      <template #item="{ element }">
+        <div style="position: relative">
+          <router-link
+            :to="element.href"
+            class="openItems"
+            :style="{ background: element.active ? '#f5f7fa' : '' }"
+          >
+            <div
+              :style="{
+                color: element.active
+                  ? 'rgba(64, 158, 255, 1)'
+                  : 'rgba(135, 139, 146, 1)',
+              }"
+            >
+              {{ element.pagename }}
+            </div>
+          </router-link>
+          <div class="close" @click.stop="closePage(element)">
+            <img src="../assets/images/openPages/close.png" />
+          </div>
+        </div>
+      </template>
+    </draggable>
+  </div>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -27,96 +42,96 @@ import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 import draggable from "vuedraggable";
 export default {
-	name: "OpenPages",
-	components: {
-		draggable,
-	},
-	setup() {
-		const store = useStore();
-		const $router = useRouter();
-		const state = reactive({
-			openList: store.state.openpages,
-		});
+  name: "OpenPages",
+  components: {
+    draggable,
+  },
+  setup() {
+    const store = useStore();
+    const $router = useRouter();
+    const state = reactive({
+      openList: store.state.openpages,
+    });
 
-		const closePage = (value) => {
-			console.log("点击关闭页面", value, state.openList);
-			state.openList.map((item, key) => {
-				if (item.href === value.href) {
-					if (state.openList.length === 1) {
-						if (state.openList[0].href !== "/learningpath") {
-							state.openList.splice(key, 1);
-						}
-						$router.push({ path: "/learningpath" });
-					} else {
-						if (value.active) {
-							if (key === state.openList.length - 1) {
-								$router.push({ path: state.openList[key - 1].href });
-							} else {
-								$router.push({ path: state.openList[key + 1].href });
-							}
-						}
-						state.openList.splice(key, 1);
-					}
-				}
-			});
-			store.commit("chengeOpenpages", state.openList);
-		};
-		return {
-			...toRefs(state),
-			closePage,
-		};
-	},
+    const closePage = (value) => {
+      console.log("点击关闭页面", value, state.openList);
+      state.openList.map((item, key) => {
+        if (item.href === value.href) {
+          if (state.openList.length === 1) {
+            if (state.openList[0].href !== "/manage/learningpath") {
+              state.openList.splice(key, 1);
+            }
+            $router.push({ path: "/manage/learningpath" });
+          } else {
+            if (value.active) {
+              if (key === state.openList.length - 1) {
+                $router.push({ path: state.openList[key - 1].href });
+              } else {
+                $router.push({ path: state.openList[key + 1].href });
+              }
+            }
+            state.openList.splice(key, 1);
+          }
+        }
+      });
+      store.commit("chengeOpenpages", state.openList);
+    };
+    return {
+      ...toRefs(state),
+      closePage,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .openPages {
-	width: 100%;
-	// height: 50px;
-	display: flex;
-	background-color: rgba(255, 255, 255, 1);
-	box-shadow: 0px 8px 8px 0px rgba(118, 136, 166, 0.1);
-	overflow-x: auto;
+  width: 100%;
+  // height: 50px;
+  display: flex;
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0px 8px 8px 0px rgba(118, 136, 166, 0.1);
+  overflow-x: auto;
 
-	.openItems {
-		width: 272px;
-		// min-width: 250px;
-		height: 50px;
-		border: 1px solid #edf2fa;
-		border-left: 0px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 16px;
-		font-weight: 400;
-		line-height: 36px;
-		cursor: pointer;
-		flex-shrink: 0;
-	}
+  .openItems {
+    width: 272px;
+    // min-width: 250px;
+    height: 50px;
+    border: 1px solid #edf2fa;
+    border-left: 0px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    font-weight: 400;
+    line-height: 36px;
+    cursor: pointer;
+    flex-shrink: 0;
+  }
 
-	.close {
-		width: 16px;
-		height: 16px;
-		border-radius: 8px;
+  .close {
+    width: 16px;
+    height: 16px;
+    border-radius: 8px;
 
-		position: absolute;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		top: 17px;
-		right: 27px;
-	}
+    position: absolute;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    top: 17px;
+    right: 27px;
+  }
 
-	.close:hover {
-		background: rgba(220, 220, 220, 1);
-	}
+  .close:hover {
+    background: rgba(220, 220, 220, 1);
+  }
 
-	.chosen {
-		// background-color: pink;
-	}
+  .chosen {
+    // background-color: pink;
+  }
 
-	.ghost {
-		// background-color: red;
-		opacity: 0;
-	}
+  .ghost {
+    // background-color: red;
+    opacity: 0;
+  }
 }
 </style>
diff --git a/src/router/config.js b/src/router/config.js
index 0265e054..27b6f975 100644
--- a/src/router/config.js
+++ b/src/router/config.js
@@ -1,16 +1,25 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-21 15:06:51
+ * @FilePath: /fe-manage/src/router/config.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 const routes = [];
 const context = require.context("@/views", true, /\.vue$/, "lazy");
 context.keys().forEach((path) => {
   // console.log('path', path)
   const componentName = path.replace(/.*\/([^\\.\\/]*)\.vue$/, "$1");
   routes.push({
-    path: `/${componentName.toLowerCase()}/:id?`,
+    path: `/manage/${componentName.toLowerCase()}/:id?`,
     name: componentName,
     component: () => context(path),
     meta: {
       isLink: true,
     },
   });
+  // console.log('routes', routes)
 });
 
 export default routes;
diff --git a/src/router/index.js b/src/router/index.js
index c2134c99..06d1632f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,26 +2,24 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-16 09:56:16
+ * @LastEditTime: 2022-11-21 14:55:13
  * @FilePath: /fe-manage/src/router/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { createRouter,createWebHistory } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
 import routesConfig from './config';
-console.log('routesConfig', routesConfig)
-
 const routes = [
 	{
 		path: '/',
 		name: '首页',
-		redirect: '/learningpath'
+		redirect: '/manage/learningpath'
 	},
 	...routesConfig
 ]
-
 const router = createRouter({
 	history: createWebHistory(),
-	routes
-})
+	base: '/manage',
+	routes,
 
+})
 export default router
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index fbdb9ea0..2e92cedb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-20 16:06:52
+ * @LastEditTime: 2022-11-21 14:50:47
  * @FilePath: /fe-manage/src/store/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -15,7 +15,7 @@ export default createStore({
       : [
         {
           pagename: "学习路径",
-          href: "/learningpath",
+          href: "/manage/learningpath",
           active: true,
         },
       ],
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index ec3bd787..72b3903d 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -785,14 +785,14 @@ export default {
       console.log(`selected ${key}`, classifyList5.value);
       //获取模版信息
       let obj = {
-        projectId: Number(key),
+        projectTemplateId: Number(key),
       };
       api
-        .getProjectDetail(obj)
+        .getTemplateDetail(obj)
         .then((res) => {
-          console.log("获取项目详情", res);
+          console.log("获取模版详情", res);
           if (res.status === 200) {
-            let info = res.data.data.projectInfo;
+            let info = res.data.data.projectTemplateInfo;
             console.log(info);
             // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
             projectName.value = info.name;
@@ -852,7 +852,7 @@ export default {
         // projectId:id?id:''
       };
       api
-        .getProjectList(obj)
+        .getTemplate(obj)
         .then((res) => {
           console.log("获取模版列表", res);
           state.totalPages = Number(res.data.data.pages);
@@ -861,7 +861,7 @@ export default {
             let array = classifyList5.value;
             arr.map((value) => {
               let obj = {
-                value: value.projectId,
+                value: value.projectTemplateId,
                 label: value.name,
               };
               array.push(obj);
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index b1172c7f..29c15a0a 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1047,6 +1047,8 @@ import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
+// import * as api1 from "../../api/index1";
+
 const drawercolumns = [
   {
     title: "项目名称",

From 8dd1053fb4d0a769d86f4ff4dc1ba12aebced8e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Mon, 21 Nov 2022 15:12:23 +0800
Subject: [PATCH 77/90] =?UTF-8?q?feat=EF=BC=9A=E9=94=81=E5=AE=9A=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E9=98=B6=E6=AE=B5=20=E9=9D=A2=E6=8E=88=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=20=E5=85=AC=E5=91=8A=20=E5=8E=86=E5=8F=B2=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=20=E9=A1=B9=E7=9B=AE=E7=A7=AF=E5=88=86=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=20=E9=A1=B9=E7=9B=AE=E5=85=B1=E4=BA=AB=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexFace.js                    |   4 +
 src/api/indexNotice.js                  |  13 +
 src/api/method.js                       | 707 ++++++++++++------------
 src/components/drawers/AddFaceteach.vue | 127 ++++-
 src/components/drawers/NoticeHis.vue    |  37 +-
 src/components/drawers/NoticePub.vue    |  34 +-
 src/components/drawers/ProjectScore.vue |  95 +++-
 src/views/projectcenter/TaskAdd.vue     |  69 ++-
 src/views/projectcenter/TaskPage.vue    | 179 +++++-
 9 files changed, 790 insertions(+), 475 deletions(-)
 create mode 100644 src/api/indexFace.js
 create mode 100644 src/api/indexNotice.js

diff --git a/src/api/indexFace.js b/src/api/indexFace.js
new file mode 100644
index 00000000..731e8fc1
--- /dev/null
+++ b/src/api/indexFace.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+//获取面授课开课详情
+export const queryFaceDetailById = (offcoursePlanId) => http.post(`http://localhost:8080/api/admin/offcourse/detailPlan?offcoursePlanId=` + offcoursePlanId + ``)
\ No newline at end of file
diff --git a/src/api/indexNotice.js b/src/api/indexNotice.js
new file mode 100644
index 00000000..c6eb8fa7
--- /dev/null
+++ b/src/api/indexNotice.js
@@ -0,0 +1,13 @@
+import http from "./config";
+
+//获取公告列表
+// export const noticeList = (projectId) => http.post('/admin/project/noticeList', {
+//   params: {
+//     projectId: projectId,
+//   }
+// });
+export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``)
+
+//发布项目公告
+export const publishNotice = (obj) => http.post('/admin/project/publishNotice', obj)
+
diff --git a/src/api/method.js b/src/api/method.js
index 4fb3d4ff..80dcd101 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -1,376 +1,377 @@
 
 function formatNumber(n) {
-	n = n.toString();
-	return n[1] ? n : "0" + n;
+  n = n.toString();
+  return n[1] ? n : "0" + n;
 }
 function toDate(number, format) {
-	var formateArr = ["Y", "M", "D", "h", "m", "s"];
-	var returnArr = [];
+  var formateArr = ["Y", "M", "D", "h", "m", "s"];
+  var returnArr = [];
 
-	if (number === 0) {
-		return 0;
-	} else {
-		var date = new Date(number * 1000);
-	}
-	returnArr.push(date.getFullYear());
-	returnArr.push(formatNumber(date.getMonth() + 1));
-	returnArr.push(formatNumber(date.getDate()));
+  if (number === 0) {
+    return 0;
+  } else {
+    var date = new Date(number * 1000);
+  }
+  returnArr.push(date.getFullYear());
+  returnArr.push(formatNumber(date.getMonth() + 1));
+  returnArr.push(formatNumber(date.getDate()));
 
-	returnArr.push(formatNumber(date.getHours()));
-	returnArr.push(formatNumber(date.getMinutes()));
-	returnArr.push(formatNumber(date.getSeconds()));
+  returnArr.push(formatNumber(date.getHours()));
+  returnArr.push(formatNumber(date.getMinutes()));
+  returnArr.push(formatNumber(date.getSeconds()));
 
-	for (var i in returnArr) {
-		format = format.replace(formateArr[i], returnArr[i]);
-	}
-	return format;
+  for (var i in returnArr) {
+    format = format.replace(formateArr[i], returnArr[i]);
+  }
+  return format;
 }
 function getWeek(date) {
-	//date:'Y-M-D'
-	let time = new Date(date).getDay()
-	let week;
-	if (time == 0) week = "星期日"
-	if (time == 1) week = "星期一"
-	if (time == 2) week = "星期二"
-	if (time == 3) week = "星期三"
-	if (time == 4) week = "星期四"
-	if (time == 5) week = "星期五"
-	if (time == 6) week = "星期六"
-	return week;
+  //date:'Y-M-D'
+  let time = new Date(date).getDay()
+  let week;
+  if (time == 0) week = "星期日"
+  if (time == 1) week = "星期一"
+  if (time == 2) week = "星期二"
+  if (time == 3) week = "星期三"
+  if (time == 4) week = "星期四"
+  if (time == 5) week = "星期五"
+  if (time == 6) week = "星期六"
+  return week;
 }
 
 /************************************将数字搞成带逗号的那种*********************************************/
 function autoComma(number) {
-	// let number = parseInt(numb)
-	if (number) {
-		let newNum = ""; //中间变量
-		let arr = [];
-		let arr1 = [];
-		let num = ""; //最终结果
-		let isDecimal = false; //是不是小数
-		let decimal = 0; //小数点所在位置
-		let decimalNum = ""; //小数点和以后的数据
-		let negative = false; //是不是负数
-		// 判断百万级别或者上亿级别
-		let thousand = false;
-		let Billion = false;
+  // let number = parseInt(numb)
+  if (number) {
+    let newNum = ""; //中间变量
+    let arr = [];
+    let arr1 = [];
+    let num = ""; //最终结果
+    let isDecimal = false; //是不是小数
+    let decimal = 0; //小数点所在位置
+    let decimalNum = ""; //小数点和以后的数据
+    let negative = false; //是不是负数
+    // 判断百万级别或者上亿级别
+    let thousand = false;
+    let Billion = false;
 
-		if (
-			(number >= 10000 || number <= -10000) &&
-			number < 100000000 &&
-			number > -100000000
-		) {
-			thousand = true;
-			number = number / 10000;
-		}
-		if (number >= 100000000 || number <= -100000000) {
-			thousand = false;
-			Billion = true;
-			number = number / 100000000;
-		}
+    if (
+      (number >= 10000 || number <= -10000) &&
+      number < 100000000 &&
+      number > -100000000
+    ) {
+      thousand = true;
+      number = number / 10000;
+    }
+    if (number >= 100000000 || number <= -100000000) {
+      thousand = false;
+      Billion = true;
+      number = number / 100000000;
+    }
 
-		if (number < 0) {
-			number = Math.abs(number);
-			negative = true;
-		}
-		let numStr = JSON.stringify(number);
-		// 如果传入的是小数，逗号的添加位置和整数是有区别滴
-		for (let i = 0; i < numStr.length; i++) {
-			if (numStr[i] === ".") {
-				isDecimal = true;
-				decimal = i;
-				decimalNum = numStr.slice(decimal, numStr.length);
-				// 保留两位小数
-				if (decimalNum.length > 2) {
-					decimalNum = decimalNum.slice(0, 3);
-				}
-				numStr = numStr.slice(0, decimal);
-			}
-		}
-		for (let i = 0; i < numStr.length; i++) {
-			arr.push(numStr[numStr.length - i - 1]);
-		}
-		for (let i = 0; i < arr.length; i++) {
-			if ((i + 1) % 3 === 0 && i + 1 !== 0 && i + 1 < arr.length) {
-				newNum += arr[i];
-				newNum = newNum + ",";
-			} else {
-				newNum += arr[i];
-			}
-		}
-		for (let i = 0; i < newNum.length; i++) {
-			arr1.push(newNum[newNum.length - i - 1]);
-		}
-		for (let i = 0; i < arr1.length; i++) {
-			num += arr1[i];
-		}
-		if (isDecimal) {
-			if (negative) {
-				// num = '-' + num + decimalNum
-				// return num
-				if (thousand) {
-					num = "-" + num + decimalNum + "万";
-					return num;
-				} else if (Billion) {
-					num = "-" + num + decimalNum + "亿";
-					return num;
-				} else {
-					num = "-" + num + decimalNum;
-					return num;
-				}
-			} else {
-				// num = num + decimalNum
-				// return num
-				if (thousand) {
-					num = num + decimalNum + "万";
-					return num;
-				} else if (Billion) {
-					num = num + decimalNum + "亿";
-					return num;
-				} else {
-					num = num + decimalNum;
-					return num;
-				}
-			}
-		} else {
-			if (negative) {
-				// num = '-' + num
-				// return num
-				if (thousand) {
-					num = "-" + num + "万";
-					return num;
-				} else if (Billion) {
-					num = "-" + num + "亿";
-					return num;
-				} else {
-					num = "-" + num;
-					return num;
-				}
-			} else {
-				if (thousand) {
-					num = num + "万";
-					return num;
-				} else if (Billion) {
-					num = num + "亿";
-					return num;
-				} else {
-					return num;
-				}
-			}
-		}
-	} else {
-		return 0;
-	}
+    if (number < 0) {
+      number = Math.abs(number);
+      negative = true;
+    }
+    let numStr = JSON.stringify(number);
+    // 如果传入的是小数，逗号的添加位置和整数是有区别滴
+    for (let i = 0; i < numStr.length; i++) {
+      if (numStr[i] === ".") {
+        isDecimal = true;
+        decimal = i;
+        decimalNum = numStr.slice(decimal, numStr.length);
+        // 保留两位小数
+        if (decimalNum.length > 2) {
+          decimalNum = decimalNum.slice(0, 3);
+        }
+        numStr = numStr.slice(0, decimal);
+      }
+    }
+    for (let i = 0; i < numStr.length; i++) {
+      arr.push(numStr[numStr.length - i - 1]);
+    }
+    for (let i = 0; i < arr.length; i++) {
+      if ((i + 1) % 3 === 0 && i + 1 !== 0 && i + 1 < arr.length) {
+        newNum += arr[i];
+        newNum = newNum + ",";
+      } else {
+        newNum += arr[i];
+      }
+    }
+    for (let i = 0; i < newNum.length; i++) {
+      arr1.push(newNum[newNum.length - i - 1]);
+    }
+    for (let i = 0; i < arr1.length; i++) {
+      num += arr1[i];
+    }
+    if (isDecimal) {
+      if (negative) {
+        // num = '-' + num + decimalNum
+        // return num
+        if (thousand) {
+          num = "-" + num + decimalNum + "万";
+          return num;
+        } else if (Billion) {
+          num = "-" + num + decimalNum + "亿";
+          return num;
+        } else {
+          num = "-" + num + decimalNum;
+          return num;
+        }
+      } else {
+        // num = num + decimalNum
+        // return num
+        if (thousand) {
+          num = num + decimalNum + "万";
+          return num;
+        } else if (Billion) {
+          num = num + decimalNum + "亿";
+          return num;
+        } else {
+          num = num + decimalNum;
+          return num;
+        }
+      }
+    } else {
+      if (negative) {
+        // num = '-' + num
+        // return num
+        if (thousand) {
+          num = "-" + num + "万";
+          return num;
+        } else if (Billion) {
+          num = "-" + num + "亿";
+          return num;
+        } else {
+          num = "-" + num;
+          return num;
+        }
+      } else {
+        if (thousand) {
+          num = num + "万";
+          return num;
+        } else if (Billion) {
+          num = num + "亿";
+          return num;
+        } else {
+          return num;
+        }
+      }
+    }
+  } else {
+    return 0;
+  }
 }
-const commonData={
-	timeout:50
+const commonData = {
+  timeout: 50
 }
 
 
 //组织树
-const  organizationalTree= [
-	{
-		title: "京东方",
-		value: "京东方",
-		children: [
-			{
-				title: "产研部",
-				value: "产研部",
-				children: [
-					{
-						title: "产品部",
-						value: "产品部",
-					},
-					{
-						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",
-					},
-				],
-			},
-			{
-				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: "行政部",
-						value: "行政部",
-					},
-				],
-			},
-		],
-	},
+const organizationalTree = [
+  {
+    title: "京东方",
+    value: "京东方",
+    children: [
+      {
+        title: "产研部",
+        value: "产研部",
+        children: [
+          {
+            title: "产品部",
+            value: "产品部",
+          },
+          {
+            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",
+          },
+        ],
+      },
+      {
+        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: "行政部",
+            value: "行政部",
+          },
+        ],
+      },
+    ],
+  },
 ]
 export {
-	toDate,
-	getWeek,
-	autoComma,
-	commonData,
-	organizationalTree,
+  toDate,
+  getWeek,
+  autoComma,
+  formatNumber,
+  commonData,
+  organizationalTree,
 }
\ No newline at end of file
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 21258240..c366534a 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -102,6 +102,7 @@
             </div>
             <div class="btnbox">
               <a-range-picker
+                v-model:value="chooseTime"
                 :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -185,10 +186,10 @@
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
-              <!-- <div class="qdqtbox">
+              <div class="qdqtbox">
                 <div class="qtbtn"><div class="btntext">签退</div></div>
-              </div> -->
-              <!-- <div class="setbox">
+              </div>
+              <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
                   <a-input-number
@@ -207,7 +208,7 @@
                     >分钟（提前签退则记为早退）</span
                   >
                 </div>
-              </div> -->
+              </div>
             </div>
           </div>
           <div class="main_item">
@@ -230,7 +231,7 @@
               <span style="margin-right: 3px">其他设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checked"
+              <a-checkbox v-model:checked="checkedHolidy"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -255,7 +256,9 @@
               <span style="margin-right: 3px">评估：</span>
             </div>
             <div class="btnbox2">
-              <a-checkbox v-model:checked="checked">需要评估</a-checkbox>
+              <a-checkbox v-model:checked="checkedAssessment"
+                >需要评估</a-checkbox
+              >
               <button class="xkbtn">选择评估</button>
             </div>
           </div>
@@ -309,7 +312,11 @@ import { reactive, toRefs } from "vue";
 import SelFacet from "../../components/drawers/SelFacet.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
-
+import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
+// import * as method from "../../api/method"
+import { message } from "ant-design-vue";
+import { queryFaceDetailById } from "../../api/indexFace";
+import dayjs from "dayjs";
 export default {
   name: "AddFaceteach",
   components: {
@@ -379,6 +386,10 @@ export default {
       testV1: "",
       radioV1: "",
       radioV2: "",
+      textV1: "",
+      checkedHolidy: false,
+      checkedAssessment: false,
+      chooseTime: [],
     });
     const closeDrawer = () => {
       ctx.emit("update:addfaceteachVisible", false);
@@ -388,9 +399,11 @@ export default {
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
-      if (bool) {
+      if (bool && props.edit) {
+        // 该页面显示同时 edit为true 时，发送查询请求,
         queryFaceTeach();
       }
+      // queryFaceTeach();
     };
     const showDrawerSelFacet = () => {
       state.selfacetvisible = true;
@@ -412,12 +425,102 @@ export default {
       }
     };
     //查询面授
-    const queryFaceTeach = () => {};
-    //更新任务列表
-    const updateTask = () => {};
+    const queryFaceTeach = () => {
+      //暂时写一个假的offcoursePlanId
+      queryFaceDetailById(2).then((res) => {
+        // state.inputV1 = res.data.data.name;
+        // state.inputV2 = res.data.data.teacherId;
+        console.log("获取到了面授课开课详情", res.data.data);
+        let result = res.data.data;
+        state.inputV1 = result.name;
+        state.textV1 = result.description;
+        state.inputV2 = result.teacher;
+        if (result.beginTime && result.endTime) {
+          state.chooseTime = [
+            dayjs(result.beginTime, "YYYY-MM-DD"),
+            dayjs(result.endTime, "YYYY-MM-DD"),
+          ];
+        } else {
+          state.chooseTime = [];
+        }
+        state.inputV4 = result.address;
+        state.inputV5 = result.beforeStart;
+        state.inputV6 = result.afterStart;
+        state.inputV7 = result.beforeEnd;
+        // state.radioV1 = result.
+        state.checkedHolidy =
+          result.completeType == 1
+            ? false
+            : result.completeType == 2
+            ? false
+            : result.completeType == 3
+            ? true
+            : false;
+        if (result.projectMember) {
+          state.radioV2 = "1";
+        } else if (result.noProjectMember) {
+          state.radioV2 = "2";
+        } else {
+          state.radioV2 = "";
+        }
+        if (result.completeSet == 1) {
+          state.radioV1 = "1";
+        } else {
+          state.radioV1 = "2";
+        }
+        state.checkedAssessment = result.evalFlag == 1 ? true : false;
+      });
+    };
+
     //新建或编辑面授
     const updateFaceTeach = () => {};
-    const upDateTable = () => {
+    const upDateTable = () => {};
+
+    //更新任务列表
+    const updateTask = (res) => {
+      if (props.isLevel == 1) {
+        let editObj1 = {
+          chapterId: props.isactive,
+          courseId: res.data.data.offcoursePlanId,
+          name: res.data.data.name,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 2,
+        };
+        RouterEditTask(editObj1)
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+            // state.addLoading = false;
+            closeDrawer();
+          })
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
+      } else if (props.isLevel == 2) {
+        let editObj = {
+          courseId: res.data.data.offcoursePlanId,
+          duration: 0,
+          name: res.data.data.name,
+          projectId: props.projectId,
+          projectTaskId: props.projectTaskId || 0,
+          stageId: props.chooseStageId,
+          type: 2,
+        };
+        // 新增编辑或新增项目
+        ProjectEditTask(editObj)
+          .then(() => {
+            message.success(
+              `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`
+            );
+            ctx.emit("changeData", false);
+          })
+          .catch(() => {
+            message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
+          });
+      } else if (props.isLevel == 3) {
+        console.log("");
+      }
     };
     return {
       ...toRefs(state),
diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 3e0012b6..953cf8aa 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -16,6 +16,8 @@
 <script>
 import { reactive, toRefs, onMounted } from "vue";
 import { getTask } from "../../api/indexTaskadd";
+import { noticeList } from "../../api/indexNotice";
+// import { toDate } from "../../api/method";
 export default {
   name: "NoticeHis",
   props: {
@@ -35,11 +37,6 @@ export default {
         //     "jwlfwefefweffjwofiewjffwefwowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefweffjwofiewjfowefjwlfwefwefwefwef",
         //   pubtime: "2022-11-7    12:23:00",
         // },
-        // {
-        //   id: 2,
-        //   content: "fjwofiewjfowefjwlfwefwefwefwef",
-        //   pubtime: "2022-11-7    12:23:00",
-        // },
       ],
       projectInfo: {},
     });
@@ -50,12 +47,42 @@ export default {
         //下一步是把公告赋值给state.notice
       });
     };
+    const setNoticeData = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((item) => {
+        let obj = {
+          id: item.noticeId,
+          content: item.notice,
+          createId: item.createId,
+          pubtime: item.createTime,
+        };
+        array.push(obj);
+      });
+      state.notice = array;
+    };
+    const getNotice = () => {
+      noticeList(props.projectId)
+        .then((res) => {
+          console.log("获取公告列表成功");
+          let result = res.data.data;
+          if (result.length > 0) {
+            setNoticeData(result);
+          }
+        })
+        .catch((err) => {
+          console.log("获取公告列表失败", err);
+        });
+    };
     onMounted(() => {
       getTaskInfo();
+      getNotice();
     });
     return {
       ...toRefs(state),
       getTaskInfo,
+      getNotice,
+      setNoticeData,
     };
   },
 };
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 4ecf4e49..fe4cb355 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -28,7 +28,8 @@
 import { message } from "ant-design-vue";
 import { reactive, toRefs, onMounted } from "vue";
 import { getTask } from "../../api/indexTaskadd";
-import { editProj } from "../../api/indexTaskadd";
+// import { editProj } from "../../api/indexTaskadd";
+import { publishNotice } from "../../api/indexNotice";
 export default {
   name: "NoticePub",
   props: {
@@ -54,36 +55,19 @@ export default {
         message.destroy();
         return message.warning("请输入公告内容");
       } else {
-        let result = state.projectInfo;
         let obj = {
-          attach: result.attach,
-          beginTime: result.beginTime,
-          boeFlag: result.boeFlag,
-          category: result.category,
-          courseSyncFlag: result.courseSyncFlag,
-          endTime: result.endTime,
-          level: result.level,
-          manager: result.manager,
-          managerId: result.managerId,
-          name: result.name,
+          createId: state.projectInfo.createId,
+          createName: state.projectInfo.createName,
           notice: state.noticeContent,
-          noticeFlag: 1,
-          parentId: result.parentId,
-          picUrl: result.picUrl,
-          projectId: result.projectId,
-          remark: result.remark,
-          sourceBelongId: result.sourceBelongId,
-          status: result.status,
-          systemId: result.systemId,
-          templateId: result.templateId,
-          type: result.type,
+          noticeId: 0,
+          projectId: props.projectId,
+          title: "",
         };
-        // console.log(result, obj, result.type);
-        editProj(obj)
+        publishNotice(obj)
           .then((res) => {
             message.destroy();
             message.success("发布成功", res);
-            state.noticeContent = null;
+            state.noticeContent = "";
           })
           .catch((err) => {
             message.destroy();
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index b818bc91..36c09559 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -291,9 +291,10 @@ import StuScoreDetail from "../../components/drawers/StuScoreDetail";
 import { reactive, toRefs, computed, onMounted } from "vue";
 import * as api from "../../api/index1";
 // import { message } from "ant-design-vue";
-// import { scoreRule } from "../../api/indexTaskadd"; //获取项目积分规则
+import { scoreRule } from "../../api/indexTaskadd"; //获取项目积分规则
 import { setScoreRule } from "../../api/indexTaskadd"; //设置项目积分规则
 import { getProjStu } from "../../api/indexProjStu";
+import { message } from "ant-design-vue";
 export default {
   name: "ProjectScore",
   components: {
@@ -512,6 +513,8 @@ export default {
       if (e == 2) {
         // console.log('获取项目积分-榜单')
         scoreRank(1, 1);
+      } else if (e == 3) {
+        getScoreRule();
       }
       rankReset();
       state.todayvalue = "1";
@@ -558,29 +561,55 @@ export default {
         });
     };
     // end -----榜单----------------榜单----------------------榜单-----------榜单----------
+    //设置积分规则
     const editRule = () => {
       console.log(props.projectId);
       let obj = {
         courseScore: state.score1,
-        examItem: {
-          numLimit: 0,
-          score: state.five2,
-          scoreLimit: state.five1,
-        },
-        //有名次要求的提交作业
-        homeworkItem: {
-          numLimit: state.four3,
-          score: state.four5,
-          scoreLimit: state.four4,
-        },
+        examItem: [
+          {
+            id: 0,
+            projectId: props.projectId,
+            numLimit: 0,
+            score: state.five2,
+            scoreLimit: state.five1,
+            type: 3,
+          },
+        ],
+
+        homeworkItem: [
+          //有名次要求的提交作业
+          {
+            id: 0,
+            projectId: props.projectId,
+            numLimit: state.four3,
+            score: state.four5,
+            scoreLimit: state.four4,
+            type: 2,
+          },
+          //无名次要求的提交作业
+          {
+            id: 0,
+            projectId: props.projectId,
+            numLimit: 0,
+            score: state.done3,
+            scoreLimit: state.done2,
+            type: 2,
+          },
+        ],
         leaderScore: state.seven1,
         projectId: props.projectId,
         signScore: state.six1,
-        topCompleteCourseItem: {
-          numLimit: state.four1,
-          score: state.four2,
-          scoreLimit: 0,
-        },
+        topCompleteCourseItem: [
+          {
+            id: 0,
+            projectId: props.projectId,
+            numLimit: state.four1,
+            score: state.four2,
+            scoreLimit: 0,
+            type: 1,
+          },
+        ],
         topStudentScore: state.seven2,
         totalScore: scoresum.value,
       };
@@ -588,9 +617,13 @@ export default {
       setScoreRule(obj)
         .then((res) => {
           console.log(res.data, "修改成功");
+          message.destroy();
+          return message.success("修改积分规则成功");
         })
         .catch((err) => {
           console.log(err.data);
+          message.destroy();
+          return message.warning("修改积分规则失败");
         });
       // scoreRule({
       //   projectId: props.projectId,
@@ -655,6 +688,33 @@ export default {
       state.searchNameValue = null;
       getStu();
     };
+    const getScoreRule = () => {
+      scoreRule({
+        projectId: props.projectId,
+      })
+        .then((res) => {
+          console.log("获取了项目积分规则", res.data.data);
+          let result = res.data.data;
+          scoresum.value = result.totalScore; //Write operation failed: computed value is readonly
+          state.seven1 = result.leaderScore;
+          state.score1 = result.courseScore;
+          state.done2 = result.homeworkItem[1].scoreLimit;
+          state.done3 = result.homeworkItem[1].score;
+          state.four1 = result.topCompleteCourseItem[0].numLimit;
+          state.four2 = result.topCompleteCourseItem[0].score;
+          state.four3 = result.homeworkItem[0].numLimit;
+          state.four4 = result.homeworkItem[0].scoreLimit;
+          state.four5 = result.homeworkItem[0].score;
+          state.five1 = result.examItem[0].scoreLimit;
+          state.five2 = result.examItem[0].score;
+          state.six1 = result.signScore;
+          state.seven1 = result.leaderScore;
+          state.seven2 = result.topStudentScore;
+        })
+        .catch((err) => {
+          console.log("获取项目积分规则失败了", err);
+        });
+    };
     onMounted(() => {
       getStu();
     });
@@ -673,6 +733,7 @@ export default {
       changePagination,
       searchStu,
       resetStud,
+      getScoreRule,
     };
   },
   // computed: {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index f7d78270..066294e6 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -989,9 +989,8 @@
       </div></a-modal
     >
 
-
-      <!-- 是否删除阶段弹窗 -->
-        <a-modal
+    <!-- 是否删除阶段弹窗 -->
+    <a-modal
       v-model:visible="deleteStageModal"
       :footer="null"
       :closable="cC"
@@ -1011,10 +1010,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">
-              <div class="btnText" >取消</div>
+              <div class="btnText">取消</div>
             </div>
             <div class="del_btn btn2" @click="deleteStage">
-              <div class="btnText" >确定</div>
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -1289,8 +1288,8 @@ export default {
       selectAll: 0, //0：未选择，1：全选，2：部分选择
 
       updateStageID: null, //编辑阶段id
-      deleteStageId:null,//删除阶段的id
-      deleteStageModal:false,//删除阶段弹窗
+      deleteStageId: null, //删除阶段的id
+      deleteStageModal: false, //删除阶段弹窗
     });
     console.log("projectId", state.projectId);
     const selectProjectName = (value, index) => {
@@ -1520,8 +1519,10 @@ export default {
                 ? localStorage.getItem("stageId")
                 : null;
               console.log("zhaodaole", stage);
-
-              if (stage !== null) {
+              // console.log("stage",Object.prototype.toString.call(stage))
+              getStageData(res.data.data.stageList);
+              if (stage !== "null") {
+                console.log(stage);
                 let stageList = res.data.data.stageList; //阶段数组
                 let result = stageList.find((item) => item.stageId == stage);
                 console.log("又找到了", result);
@@ -1530,11 +1531,9 @@ export default {
                 let arr = res.data.data.stageList[0].taskList;
                 console.log("任务列表", arr);
                 getTableData(arr);
+                // state.isActive = true;
+                changebgc(res.data.data.stageList[0].stageId);
               }
-              // let stageList = res.data.data.stageList; //阶段数组
-              // let result = stageList.find((item) => item.stageId == stage);
-              // console.log("又找到了", result);
-              // getTableData(result.taskList);
 
               // 每次都获取了第一条taskList
               // let arr = res.data.data.stageList[0].taskList;
@@ -1544,7 +1543,7 @@ export default {
 
             let stagearr = res.data.data.stageList;
             let arrlist = state.curLevel;
-            //console.log(stagearr, 111111);
+            console.log(stagearr, 111111);
             if (stagearr.length > 0) {
               getStageData(stagearr);
               stagearr.map((value) => {
@@ -1553,11 +1552,11 @@ export default {
               });
             }
             //给阶段id赋初始值
-            let stage = localStorage.getItem("stageId")
+            let stageid = localStorage.getItem("stageId")
               ? localStorage.getItem("stageId")
               : null;
-            if (stage !== "null") {
-              state.chooseStageId = stage;
+            if (stageid !== "null") {
+              state.chooseStageId = stageid;
             } else {
               state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
             }
@@ -1719,7 +1718,7 @@ export default {
             console.log("修改阶段成功", res);
             state.valuesname = "";
             state.valuesnotice = "";
-           closeModal()
+            closeModal();
             state.updateStageID = null;
             message.destroy();
             message.success("修改阶段成功");
@@ -1738,9 +1737,9 @@ export default {
           .editStage(obj)
           .then((res) => {
             console.log("添加阶段成功", res);
-            state.valuesname = ""
-              state.valuesnotice = ""
-             closeModal()
+            state.valuesname = "";
+            state.valuesnotice = "";
+            closeModal();
             message.destroy();
             message.success("添加阶段成功");
             getTask();
@@ -1751,19 +1750,17 @@ export default {
       }
     };
 
-
-//打开删除阶段弹窗
-const showDeleteStage=(id)=>{
-
-state.deleteStageId=id
- state.deleteStageModal=true
-}
-//关闭删除阶段弹窗
-const closeDeleteStage=()=>{
-  state.deleteStageId=null
-  state.deleteStageModal=false
-}
- //删除阶段
+    //打开删除阶段弹窗
+    const showDeleteStage = (id) => {
+      state.deleteStageId = id;
+      state.deleteStageModal = true;
+    };
+    //关闭删除阶段弹窗
+    const closeDeleteStage = () => {
+      state.deleteStageId = null;
+      state.deleteStageModal = false;
+    };
+    //删除阶段
     const deleteStage = () => {
       console.log("chapterId", state.deleteStageId);
       let obj = {
@@ -1773,8 +1770,8 @@ const closeDeleteStage=()=>{
         .deleteStage(obj)
         .then((res) => {
           console.log("删除阶段成功", res);
-          message.success('删除阶段成功')
-          closeDeleteStage()
+          message.success("删除阶段成功");
+          closeDeleteStage();
           getTask();
         })
         .catch((err) => {
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 2859cfaa..b4f2bf03 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1049,8 +1049,8 @@
                         </span>
                       </div>
                       <div
-                        v-for="item in docList"
-                        :key="item.src"
+                        v-for="item in fileList"
+                        :key="item.uid"
                         class="docListStyle"
                       >
                         <img
@@ -1066,7 +1066,7 @@
                         <span style="font: oblique bold 16px Sans-serif">{{
                           item.name
                         }}</span>
-                        <span style="color: #4ea6ff; float: right">删除</span>
+                        <span style="color: #4ea6ff; float: right;cursor: pointer;" @click="deFile(item.uid)">删除</span>
                       </div>
                     </div>
                   </div>
@@ -1713,6 +1713,7 @@ import {
 import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
 import { getTask } from "../../api/indexTaskadd";
+import { editProj } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
@@ -1776,20 +1777,6 @@ export default {
       choosedStageId: 1, // 选择的阶段id
       activeSetKey: "12", //12-基础信息 13-共享文档
       docChecked: true,
-      docList: [
-        {
-          name: "测试文档1.doc",
-          src: "",
-        },
-        {
-          name: "测试文档2.doc",
-          src: "",
-        },
-        {
-          name: "测试文档3.doc",
-          src: "",
-        },
-      ],
       //学员信息列表
       tabledata: [
         // {
@@ -1907,6 +1894,7 @@ export default {
       ChangeGroupStuId: null, //要换组的学生id
       ChangeGroupStuName: null, //要换组的学生name
       ChangeGroupId: null, //要换组的学生的小组id
+      fileList: [], //文件列表
       //进度排行表
       jindutabledata: [
         {
@@ -2371,16 +2359,31 @@ export default {
       valueName: "", //排行榜输入姓名
 
       //设置
-      name: null, //项目名称
-      startTime: null, //开始时间
-      endTime: null, //结束时间
-      manager: null, //项目经理
-      sourceBelong: null, //资源归属
-      remark: null, //项目说明
-      level: null, //项目级别
+      name: null, //项目名称 未改
+      startTime: null, //开始时间 已改
+      tstartTime: null, //开始事件 未改
+      endTime: null, //结束时间 已改
+      tendTime: null, //结束时间 未改
+      manager: null, //项目经理 未改
+      sourceBelong: null, //资源归属 已改
+      tsourceBelong: null, //资源归属 未改
+      remark: null, //项目说明 未改
+      level: null, //项目级别  已改
+      tlevel: null, //项目级别 未改
       systemId: null, //培训分类
-      picUrl: null,
-      parentId: null,
+      tsystemId: null, //培训分类 未改
+      picUrl: null, //未改
+      parentId: null, //未改
+      courseSyncFlag: null, //未改
+      boeFlag: null, //未改
+      managerId: null, //未改
+      notice: null, //未改
+      status: null, //未改
+      type: null, //未改
+      category: null, //未改
+      noticeFlag: null, //未改
+      templateId: null, //未改
+      attach: null,
     });
 
     const levelList = reactive({
@@ -3309,6 +3312,9 @@ export default {
         let info = res.data.data.projectInfo;
         let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
         let end = toDate(info.endTime / 1000, "Y-M-D h:m");
+        state.tstartTime = info.beginTime;
+        state.tendTime = info.endTime;
+        state.tsourceBelong = info.sourceBelongId;
         state.parentId = info.parentId;
         state.name = info.name;
         state.startTime = start;
@@ -3325,6 +3331,7 @@ export default {
             : info.level == 4
             ? "部门级"
             : "-";
+        state.tlevel = info.level;
         state.systemId =
           info.systemId == 1
             ? "集团级"
@@ -3335,9 +3342,20 @@ export default {
             : info.systemId == 4
             ? "部门级"
             : "-";
+        state.tsystemId = info.systemId;
         state.checkedSty = info.courseSyncFlag == 1 ? true : false;
+        state.courseSyncFlag = info.courseSyncFlag;
         state.checkedBOEU = info.boeFlag == 1 ? true : false;
+        state.boeFlag = info.boeFlag;
         state.picUrl = info.picUrl;
+        state.managerId = info.managerId;
+        state.notice = info.notice;
+        state.status = info.status;
+        state.type = info.type;
+        state.category = info.category;
+        state.noticeFlag = info.noticeFlag;
+        // state.attach = info.attach;
+        // state.templateId = info.templateId;
         state.sourceBelong =
           info.sourceBelongId == 1
             ? "项目一"
@@ -3346,6 +3364,24 @@ export default {
             : info.sourceBelongId == 3
             ? "项目三"
             : "-";
+        // state.fileList=info.attach.split(",")
+        let d = info.attach.indexOf(",");
+        console.log(info.attach, "xgo", info.attach.length);
+        if (info.attach.length == 0) {
+          return;
+        } else if (info.attach.length !== 0 && d == -1) {
+          return;
+        } else {
+          console.log(info.attach, "xgo");
+          // let str = JSON.parse(info.attach)
+          // console.log("赚回来",str)
+          // let luj = info.attach.split(",")
+          let luj = info.attach;
+          console.log("lulj", luj);
+          console.log("赚回来", JSON.parse(luj));
+          state.fileList = JSON.parse(luj)
+          // state.fileList = luj
+        }
       });
     };
     //获取小组列表
@@ -3453,8 +3489,54 @@ export default {
     //end---------项目概览
 
     const handleChange = (info) => {
+      let list = [];
       if (info.file.status !== "uploading") {
-        console.log(info.file, info.fileList);
+        console.log(info.file.response.data, info.fileList);
+        // info.fileList.map((item) => {
+        //   //把地址放到list里
+        //   // list.push(item.response.data);
+        //   // list.push(JSON.stringify(item))
+        //     state.fileList.push(item)
+        // });
+        
+        state.fileList.push(info.file)
+        list = state.fileList
+        console.log("list", list);
+        // let str = list.join(",");
+        let str = JSON.stringify(list);
+        console.log("str", str);
+        //要编辑项目
+        editProj({
+          attach: str,
+          beginTime: state.tstartTime.slice(0, 10),
+          // beginTime:1668643200,
+          boeFlag: state.boeFlag,
+          category: state.category,
+          courseSyncFlag: state.courseSyncFlag,
+          endTime: state.tendTime.slice(0, 10),
+          // endTime: 1668816000,
+          level: state.tlevel,
+          manager: state.manager,
+          managerId: state.managerId,
+          name: state.name,
+          notice: state.notice,
+          noticeFlag: state.noticeFlag,
+          parentId: state.parentId,
+          picUrl: state.picUrl,
+          projectId: state.projectId,
+          remark: state.remark,
+          sourceBelongId: Number(state.tsourceBelong),
+          status: state.status,
+          systemId: state.tsystemId,
+          templateId: state.templateId || 0,
+          type: state.type,
+        })
+          .then((res) => {
+            console.log("上传成功", res);
+          })
+          .catch((err) => {
+            console.log("上传失败了", err);
+          });
       }
 
       if (info.file.status === "done") {
@@ -3644,6 +3726,46 @@ export default {
           console.log("模版保存失败", err);
         });
     };
+    //删除文件
+    const deFile=(id)=>{
+      console.log(id)
+      let index = state.fileList.findIndex(item=>{item.uid==id})
+      state.fileList.splice(index,1)
+      let str = JSON.stringify(state.fileList)
+      editProj({
+          attach: str,
+          beginTime: state.tstartTime.slice(0, 10),
+          // beginTime:1668643200,
+          boeFlag: state.boeFlag,
+          category: state.category,
+          courseSyncFlag: state.courseSyncFlag,
+          endTime: state.tendTime.slice(0, 10),
+          // endTime: 1668816000,
+          level: state.tlevel,
+          manager: state.manager,
+          managerId: state.managerId,
+          name: state.name,
+          notice: state.notice,
+          noticeFlag: state.noticeFlag,
+          parentId: state.parentId,
+          picUrl: state.picUrl,
+          projectId: state.projectId,
+          remark: state.remark,
+          sourceBelongId: Number(state.tsourceBelong),
+          status: state.status,
+          systemId: state.tsystemId,
+          templateId: state.templateId || 0,
+          type: state.type,
+        })
+          .then((res) => {
+            console.log("上传成功", res);
+            message.destroy()
+            return message.success("删除成功")
+          })
+          .catch((err) => {
+            console.log("上传失败了", err);
+          });
+    }
     onMounted(() => {
       getStu();
       getTaskList();
@@ -3651,6 +3773,8 @@ export default {
       getGroup();
       getOverview();
       reget();
+      // let a = state.attach.split(",")
+      // state.fileList = a
     });
     return {
       ...toRefs(state),
@@ -3744,6 +3868,7 @@ export default {
       closeStartModal,
       templateProject,
       changeGrouped,
+      deFile,
     };
   },
 };

From 386c6e6ee5e313a6de452c68e4cb55acb2cd326a Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 21 Nov 2022 15:29:25 +0800
Subject: [PATCH 78/90] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9vue=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                           |   10 +-
 src/components/BreadCrumb.vue               |  101 +-
 src/components/vote/CreateVote.vue          |   91 +-
 src/views/learningpath/LearningPath.vue     |    4 +-
 src/views/learningpath/LevelAdd.vue         |  248 +-
 src/views/learningpath/LevelAddDetail.vue   |    4 +-
 src/views/learningpath/LevelCheck.vue       |    2 +-
 src/views/projectcenter/ClassAdd.vue        |   10 +-
 src/views/projectcenter/LibraryAdd.vue      |  740 +++---
 src/views/projectcenter/ProjectAdd.vue      |    8 +-
 src/views/projectcenter/ProjectManage.vue   |   36 +-
 src/views/projectcenter/SonProject.vue      | 1991 ++++++++-------
 src/views/projectcenter/TaskAdd.vue         |    2 +-
 src/views/projectcenter/TaskPage.vue        |   14 +-
 src/views/projectcenter/TemplateLibrary.vue |  150 +-
 src/views/projectcenter/templateAdd.vue     | 2480 +++++++++----------
 src/views/research/ManagePage.vue           |    4 +-
 src/views/research/ResearchAdd copy.vue     |    8 +-
 src/views/research/ResearchAdd.vue          |   10 +-
 src/views/research/ResearchManage.vue       |    4 +-
 src/views/system/SystemManage.vue           |    2 +-
 vue.config.js                               |   14 +-
 22 files changed, 3132 insertions(+), 2801 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 90d5a99d..f545226a 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -1,3 +1,11 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-21 14:32:52
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-21 15:13:50
+ * @FilePath: /fe-manage/src/api/config.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import axios from "axios";
 // const Qs = require("qs");
 
@@ -7,7 +15,7 @@ import axios from "axios";
 axios.defaults.withCredentials = true;
 
 const http = axios.create({
-  baseURL: "/api",
+  baseURL: "/manageApi",
   timeout: 1000 * 5,
   // headers: { "Content-Type": "multipart/form-data" },
   headers: { "Content-Type": "application/json" },
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index c4cb108c..93fa3e24 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -34,8 +34,8 @@ export default {
         console.log("new:" + n + ",old:" + o);
 
         if (
-          n.indexOf("/learningpath") !== -1 ||
-          n.indexOf("/LearningPath") !== -1
+          n.indexOf("/manage/learningpath") !== -1 ||
+          n.indexOf("/manage/LearningPath") !== -1
         ) {
           state.list = [
             {
@@ -45,11 +45,14 @@ export default {
             },
           ];
         }
-        if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) {
+        if (
+          n.indexOf("/manage/leveladd") !== -1 ||
+          n.indexOf("/manage/LevelAdd") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
-              href: "/learningpath",
+              href: "/manage/learningpath",
             },
             {
               name: "管理",
@@ -57,17 +60,17 @@ export default {
           ];
         }
         if (
-          n.indexOf("/leveladddetail") !== -1 ||
-          n.indexOf("/LevelAddDetail") !== -1
+          n.indexOf("/manage/leveladddetail") !== -1 ||
+          n.indexOf("/manage/LevelAddDetail") !== -1
         ) {
           state.list = [
             {
               name: "学习路径",
-              href: "/learningpath",
+              href: "/manage/learningpath",
             },
             {
               name: "管理",
-              href: "/leveladd",
+              href: "/manage/leveladd",
             },
             {
               name: "创建关卡",
@@ -75,17 +78,17 @@ export default {
           ];
         }
         if (
-          n.indexOf("/levelcheck") !== -1 ||
-          n.indexOf("/LevelCheck") !== -1
+          n.indexOf("/manage/levelcheck") !== -1 ||
+          n.indexOf("/manage/LevelCheck") !== -1
         ) {
           state.list = [
             {
               name: "学习路径",
-              href: "/learningpath",
+              href: "/manage/learningpath",
             },
             {
               name: "管理",
-              href: "/leveladd",
+              href: "/manage/leveladd",
             },
             {
               name: "查看",
@@ -93,8 +96,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/projectmanage") !== -1 ||
-          n.indexOf("/ProjectManage") !== -1
+          n.indexOf("/manage/projectmanage") !== -1 ||
+          n.indexOf("/manage/ProjectManage") !== -1
         ) {
           state.list = [
             {
@@ -109,20 +112,23 @@ export default {
           ];
         }
         if (
-          n.indexOf("/projectadd") !== -1 ||
-          n.indexOf("/ProjectAdd") !== -1
+          n.indexOf("/manage/projectadd") !== -1 ||
+          n.indexOf("/manage/ProjectAdd") !== -1
         ) {
           state.list = [
             {
               name: "项目",
-              href: "/projectmanage",
+              href: "/manage/projectmanage",
             },
             {
               name: "创建项目",
             },
           ];
         }
-        if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) {
+        if (
+          n.indexOf("/manage/taskpage") !== -1 ||
+          n.indexOf("/manage/TaskPage") !== -1
+        ) {
           state.list = [
             {
               name: "项目",
@@ -133,7 +139,10 @@ export default {
             },
           ];
         }
-        if (n.indexOf("/taskadd") !== -1 || n.indexOf("/TaskAdd") !== -1) {
+        if (
+          n.indexOf("/manage/taskadd") !== -1 ||
+          n.indexOf("/manage/TaskAdd") !== -1
+        ) {
           state.list = [
             {
               name: "项目",
@@ -151,8 +160,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/templatelibrary") !== -1 ||
-          n.indexOf("/TemplateLibrary") !== -1
+          n.indexOf("/manage/templatelibrary") !== -1 ||
+          n.indexOf("/manage/TemplateLibrary") !== -1
         ) {
           state.list = [
             {
@@ -164,8 +173,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/libraryadd") !== -1 ||
-          n.indexOf("/LibraryAdd") !== -1
+          n.indexOf("/manage/libraryadd") !== -1 ||
+          n.indexOf("/manage/LibraryAdd") !== -1
         ) {
           state.list = [
             {
@@ -176,13 +185,13 @@ export default {
             },
             {
               name: "查看",
-              href: "/libraryadd",
+              href: "/manage/libraryadd",
             },
           ];
         }
         if (
-          n.indexOf("/coursemanage") !== -1 ||
-          n.indexOf("/CourseManage") !== -1
+          n.indexOf("/manage/coursemanage") !== -1 ||
+          n.indexOf("/manage/CourseManage") !== -1
         ) {
           state.list = [
             {
@@ -197,8 +206,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/coursewaremanage") !== -1 ||
-          n.indexOf("/CoursewareManage") !== -1
+          n.indexOf("/manage/coursewaremanage") !== -1 ||
+          n.indexOf("/manage/CoursewareManage") !== -1
         ) {
           state.list = [
             {
@@ -210,8 +219,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/researchmanage") !== -1 ||
-          n.indexOf("/ResearchManage") !== -1
+          n.indexOf("/manage/researchmanage") !== -1 ||
+          n.indexOf("/manage/ResearchManage") !== -1
         ) {
           state.list = [
             {
@@ -222,8 +231,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/managepage") !== -1 ||
-          n.indexOf("/ManagePage") !== -1
+          n.indexOf("/manage/managepage") !== -1 ||
+          n.indexOf("/manage/ManagePage") !== -1
         ) {
           state.list = [
             {
@@ -238,8 +247,8 @@ export default {
         }
 
         if (
-          n.indexOf("/researchadd") !== -1 ||
-          n.indexOf("/ResearchAdd") !== -1
+          n.indexOf("/manage/researchadd") !== -1 ||
+          n.indexOf("/manage/ResearchAdd") !== -1
         ) {
           state.list = [
             {
@@ -254,8 +263,8 @@ export default {
         }
 
         if (
-          n.indexOf("/certificatecenter") !== -1 ||
-          n.indexOf("/CertificateCenter") !== -1
+          n.indexOf("/manage/certificatecenter") !== -1 ||
+          n.indexOf("/manage/CertificateCenter") !== -1
         ) {
           state.list = [
             {
@@ -264,8 +273,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/systemmanage") !== -1 ||
-          n.indexOf("/SystemManage") !== -1
+          n.indexOf("/manage/systemmanage") !== -1 ||
+          n.indexOf("/manage/SystemManage") !== -1
         ) {
           state.list = [
             {
@@ -274,8 +283,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/coursereviewed") !== -1 ||
-          n.indexOf("/CourseReiewed") !== -1
+          n.indexOf("/manage/coursereviewed") !== -1 ||
+          n.indexOf("/manage/CourseReiewed") !== -1
         ) {
           state.list = [
             {
@@ -287,8 +296,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/coursereviewedn") !== -1 ||
-          n.indexOf("/CourseReiewedN") !== -1
+          n.indexOf("/manage/coursereviewedn") !== -1 ||
+          n.indexOf("/manage/CourseReiewedN") !== -1
         ) {
           state.list = [
             {
@@ -300,8 +309,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/projectreviewed") !== -1 ||
-          n.indexOf("/ProjectReviewed") !== -1
+          n.indexOf("/manage/projectreviewed") !== -1 ||
+          n.indexOf("/manage/ProjectReviewed") !== -1
         ) {
           state.list = [
             {
@@ -313,8 +322,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/projectreviewedn") !== -1 ||
-          n.indexOf("/ProjectReviewedN") !== -1
+          n.indexOf("/manage/projectreviewedn") !== -1 ||
+          n.indexOf("/manage/ProjectReviewedN") !== -1
         ) {
           state.list = [
             {
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 4f7d1646..3cf72955 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -1,12 +1,20 @@
 <!-- 评估管理-创建评估页面 -->
 <template>
-  <a-drawer :visible="createVoteVisible" class="drawerStyle createvoteDrawer" width="100%" placement="right"
-    @after-visible-change="afterVisibleChange">
+  <a-drawer
+    :visible="createVoteVisible"
+    class="drawerStyle createvoteDrawer"
+    width="100%"
+    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" />
+        <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">
@@ -17,7 +25,12 @@
             <span style="margin-right: 3px">投票名称：</span>
           </div>
           <div class="btnbox">
-            <a-input v-model:value="voteName" style="width: 424px; height: 32px" placeholder="请输入任务名称" maxlength="20" />
+            <a-input
+              v-model:value="voteName"
+              style="width: 424px; height: 32px"
+              placeholder="请输入任务名称"
+              maxlength="20"
+            />
           </div>
         </div>
         <div class="main_item">
@@ -28,25 +41,40 @@
             <span>创建题干：</span>
           </div>
           <div class="btnbox">
-            <button class="xkbtn" @click="handleTypes">
-              添加题干
-            </button>
+            <button class="xkbtn" @click="handleTypes">添加题干</button>
           </div>
-        </div> <!-- 创建投票侧弹窗 -->
+        </div>
+        <!-- 创建投票侧弹窗 -->
       </div>
       <div v-for="(item, index) in allFormsData" :key="index">
         <VoteQuestion :item="item" :ballotId="ballotId" @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
+            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
+            type="primary"
+            ghost
+            style="
+              width: 100px;
+              height: 40px;
+              margin-left: 14px;
+              border-radius: 8px;
+            "
+            @click="handleAllCancel"
+          >
             取消
           </a-button>
         </div>
@@ -67,18 +95,15 @@ import {
   // deepCloneFilterString,
 } from "../../utils/utils";
 
-
 //import store from "@/store";
 import * as api from "@/api/indexVote";
 import {} from "@/api/indexResearch";
 //import { message } from "ant-design-vue";
 
-
 export default {
   name: "CreateVote",
   components: {
     VoteQuestion,
-
   },
   props: {
     createVoteVisible: {
@@ -93,37 +118,35 @@ export default {
       type: Boolean,
       default: false,
     },
-
   },
   setup(props, ctx) {
     const state = reactive({
       ballotId: "",
       ballotName: "",
       allFormsData: [],
-
     });
     const afterVisibleChange = () => {
       handleTypes();
     };
     const closeDrawer = () => {
       ctx.emit("update:createVoteVisible", false);
-    }
+    };
     // 详情
     const getInfoDate = async () => {
       if (props.editChild) {
         //stemId 多余字段
-        let res = await api.queryStemByStemId({
-          stemId: 0,
-          ballotId: state.ballotId,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            return res.data.data;
-          }
-        });
+        let res = await api
+          .queryStemByStemId({
+            stemId: 0,
+            ballotId: state.ballotId,
+          })
+          .then((res) => {
+            if (res.data.code === 200) {
+              return res.data.data;
+            }
+          });
         state.ballotName = res[0].ballotId;
-        let renderArr = [
-          ...res,
-        ];
+        let renderArr = [...res];
         // sortBy(renderArr, "orderNumber"); //序号
         state.allFormsData = parseData(renderArr); //类型
       }
@@ -149,8 +172,6 @@ export default {
           singleList: restList,
         };
         resultArr.push(obj);
-
-
       });
       resultArr.map((itm, idx) => {
         itm.id = idx + 1;
@@ -345,7 +366,7 @@ export default {
           if (res.data.code === 200) {
             message.success("编辑成功");
             router.push({
-              path: "/researchmanage",
+              path: "/manage/researchmanage",
             });
           }
         });
@@ -370,7 +391,6 @@ export default {
     };
     const handleAllCancel = () => {
       state.allFormsData = [];
-
     };
     /** 
     const checkVal = (filterData) => {
@@ -585,6 +605,5 @@ export default {
       }
     }
   }
-
 }
 </style>
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 7e7a1fed..5cc8b378 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -49,7 +49,7 @@
         </div>
       </div>
       <div class="btns">
-        <!-- <router-link to="/projectadd">
+        <!-- <router-link to="/manage/projectadd">
           <div class="btn btn3">
             <div class="search"></div>
             <div class="btnText">创建路径</div>
@@ -1213,7 +1213,7 @@ export default {
                     class="g1"
                     onClick={() => {
                       router.push({
-                        path: "/leveladd",
+                        path: "/manage/leveladd",
                       });
                       storage.set("routerId", text.record.id);
                     }}
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index ed6b2467..def8e4c5 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -73,7 +73,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/learningpath"
+        <router-link to="/manage/learningpath"
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -98,29 +98,29 @@
               <div class="taskmain">快速创建项目详情</div>
             </div>
             <div class="second">
-              <router-link :to="{ path: '/leveladddetail' }">
+              <router-link :to="{ path: '/manage/leveladddetail' }">
+                <div
+                  class="taskbox"
+                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+                >
+                  <div class="leftt">
+                    <img src="../../assets/images/taskpage/left1.png" />
+                  </div>
+                  <div class="photo">
+                    <img src="../../assets/images/taskpage/picture1.png" />
+                  </div>
+                  <div class="rightt">
+                    <img src="../../assets/images/taskpage/right1.png" />
+                  </div>
+                  <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
+                    添加任务
+                  </div>
+                  <div class="centermain">快速添加任务/关卡</div>
+                </div>
+              </router-link>
               <div
                 class="taskbox"
-                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
-              >
-             
-                <div class="leftt">
-                  <img src="../../assets/images/taskpage/left1.png" />
-                </div>
-                <div class="photo">
-                  <img src="../../assets/images/taskpage/picture1.png" />
-                </div>
-                <div class="rightt">
-                  <img src="../../assets/images/taskpage/right1.png" />
-                </div>
-                <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
-                  添加任务
-                </div>
-                <div class="centermain">快速添加任务/关卡</div>
-              </div>
-            </router-link>
-              <div
-                class="taskbox" @click="showAddStu"
+                @click="showAddStu"
                 style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
               >
                 <div class="leftt">
@@ -132,9 +132,7 @@
                 <div class="rightt">
                   <img src="../../assets/images/taskpage/right2.png" />
                 </div>
-                <div class="centerbox"
-                
-                style="color: rgba(78, 166, 255, 1)">
+                <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   添加学员
                 </div>
                 <div class="centermain">快速添加学员</div>
@@ -219,16 +217,16 @@
                   stage2: item.stageId != choosedStageId,
                 }"
                 :key="item.stageId"
-                @click="stageChange(item.name,item.stageId)"
+                @click="stageChange(item.name, item.stageId)"
               >
-              关卡{{ item.stageId }}
+                关卡{{ item.stageId }}
               </div>
               <!-- <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
               <div class="staname">关卡名称：</div>
-              <div class="stamess">{{stateName}}</div>
+              <div class="stamess">{{ stateName }}</div>
             </div>
             <div class="stagelast">
               <div class="stagepro">
@@ -314,7 +312,7 @@
                     <div class="search"></div>
                     <div class="btnText">重置</div>
                   </div>
-                  <router-link to="/leveladddetail">
+                  <router-link to="/manage/leveladddetail">
                     <div class="btn btn3" @click="handleOut">
                       <div class="search"></div>
                       <div class="btnText">创建关卡</div>
@@ -336,7 +334,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
 
-              <router-link to="/leveladddetail" class="editright">
+              <router-link to="/manage/leveladddetail" class="editright">
                 <img
                   class="editimg"
                   src="../../assets/images/leveladd/edit.png"
@@ -346,7 +344,7 @@
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
-              <router-link :to="{ path: '/leveladddetail' }">
+              <router-link :to="{ path: '/manage/leveladddetail' }">
                 <div
                   class="taskbox"
                   style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -564,14 +562,31 @@
                   style="width: 270px; height: 40px; border-radius: 8px"
                   placeholder="关卡名称"
                 />
-                <div class="btns" @click="searchLevel" >
+                <div class="btns" @click="searchLevel">
                   <div class="btn btn1">
                     <div class="search"></div>
-                    <a-button class="btnText" style="border:none;background:none;transform: translateY(-20%);"  >搜索</a-button>
+                    <a-button
+                      class="btnText"
+                      style="
+                        border: none;
+                        background: none;
+                        transform: translateY(-20%);
+                      "
+                      >搜索</a-button
+                    >
                   </div>
                   <div class="btn btn2" @click="resetLevel">
                     <div class="search"></div>
-                    <a-button style="border:none;background:none; transform: translateY(-20%);width:100%;" class="btnText" >重置</a-button>
+                    <a-button
+                      style="
+                        border: none;
+                        background: none;
+                        transform: translateY(-20%);
+                        width: 100%;
+                      "
+                      class="btnText"
+                      >重置</a-button
+                    >
                   </div>
                 </div>
               </div>
@@ -592,11 +607,11 @@
                 <div class="xu">
                   <span class="yi">已选择</span>
                   <div style="width: 5px; display: inline-block"></div>
-                  <span class="th">{{selectedRowKeys.length}}</span>
+                  <span class="th">{{ selectedRowKeys.length }}</span>
                   <div style="width: 5px; display: inline-block"></div>
                   <span class="yi">项</span>
                   <span class="zon">列表选项总数：</span>
-                  <span class="th">{{tableData.length}}</span>
+                  <span class="th">{{ tableData.length }}</span>
                   <span class="yi"> 条</span>
                 </div>
               </div>
@@ -763,7 +778,7 @@
                       <div
                         v-for="item in docList"
                         :key="item.src"
-                        style="margin-top: 20px;"
+                        style="margin-top: 20px"
                         class="docListStyle"
                       >
                         <img
@@ -827,13 +842,13 @@
           </div>
         </div></a-modal
       >
-      
+
       <!-- 查看学员 传入查看学员的id-->
-    <see-stu
-      v-model:Seevisible="Seevisible"
-      v-model:checkStuId="checkStuId"
-      v-model:projectId="projectId"
-    />
+      <see-stu
+        v-model:Seevisible="Seevisible"
+        v-model:checkStuId="checkStuId"
+        v-model:projectId="projectId"
+      />
 
       <!-- 批量删除学员弹窗 -->
       <a-modal
@@ -1157,7 +1172,7 @@ import FaceStu from "../../components/drawers/FaceStu";
 import ActiveAttendance from "../../components/drawers/ActiveAttendance";
 import TimeManage from "../../components/drawers/TimeManage";
 import TestManage from "../../components/drawers/TestManage";
-import FaceManage from "../../components/drawers/FaceManage"; 
+import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
 import SeeStu from "../../components/drawers/SeeStu";
 // import { useRoute } from "vue-router";
@@ -1181,7 +1196,7 @@ export default {
     TestManage,
     FaceManage,
     WorkManage,
-    SeeStu
+    SeeStu,
   },
   setup() {
     // const routers = useRoute();
@@ -1208,31 +1223,31 @@ export default {
       CheckStuvisible: false, //学员管理的查看抽屉
       addLoading: false, // 加载动画
       choosedStageId: 1, // 选择的阶段id
-      selectedRowKeys:[],
+      selectedRowKeys: [],
       twobtn: true,
       number: true,
       twobtnn: false,
-      Seevisible:false,
-      checkStuId:null,
+      Seevisible: false,
+      checkStuId: null,
       inputbox: false,
       Wvisible: false, //作业管理
       studentId: null,
       styTitle: null,
       cretime: null,
       picUrl: null,
-      projectNameList:[
-        { 
-          value: '1',
-          label: '导出信息',
+      projectNameList: [
+        {
+          value: "1",
+          label: "导出信息",
         },
-        { 
-          value: '2',
-          label: '批量调整关卡',
+        {
+          value: "2",
+          label: "批量调整关卡",
+        },
+        {
+          value: "3",
+          label: "批量删除",
         },
-        { 
-          value: '3',
-          label: '批量删除',
-        }
       ],
       // 共享文档列表
       docList: [
@@ -1299,7 +1314,7 @@ export default {
       visible: false, //时间管理
       TMvisible: false, //考试管理
       FaceVisivle: false, //面授管理
-      stateName:null, // 关卡名称
+      stateName: null, // 关卡名称
       //关卡的数据
       level: [
         // {
@@ -1563,10 +1578,10 @@ export default {
     const closehuodModal = () => {
       state.huodModal = false;
     };
-    const stageChange = (name,id) => {
+    const stageChange = (name, id) => {
       state.choosedStageId = id;
       state.stateName = name;
-    }
+    };
     const changeTabs = (e) => {
       console.log("切换tabs", e, state.routerId);
       if (e == 2) {
@@ -1756,7 +1771,6 @@ export default {
         .catch((err) => {
           console.log("复制失败", err);
         });
-      
     };
     const showStop = () => {
       state.stopModal = true;
@@ -1832,7 +1846,7 @@ export default {
     const myGetRouterDetail = () => {
       GetRouterDetail(state.routerId)
         .then((res) => {
-          if(res.data.data.routerInfo.status == 1) {
+          if (res.data.data.routerInfo.status == 1) {
             state.nodata = false;
           }
           let data = res.data.data.chapterList;
@@ -1847,12 +1861,15 @@ export default {
           //   }
           //   }
           levelList.stageList = [];
-          for(let i in data) {
-            if(i==0) {state.stateName = data[0].name}
-          levelList.stageList.push({
-          stageId:Number(i)+1,
-          name:data[i].name
-      }) }
+          for (let i in data) {
+            if (i == 0) {
+              state.stateName = data[0].name;
+            }
+            levelList.stageList.push({
+              stageId: Number(i) + 1,
+              name: data[i].name,
+            });
+          }
         })
         .catch((err) => {
           console.log(err);
@@ -1884,7 +1901,7 @@ export default {
             .delStudent({ routerId: 100, studentIds: [id] })
             .then((res) => {
               message.success("删除成功");
-              getStudent()
+              getStudent();
               console.log(res);
             })
             .catch((err) => {
@@ -1895,61 +1912,74 @@ export default {
       });
     };
     const searchLevel = () => {
-      const result = state.tableData.filter(item => item.cur == state.gatenamee)
+      const result = state.tableData.filter(
+        (item) => item.cur == state.gatenamee
+      );
       state.tableData = result;
     };
     const resetLevel = () => {
-      state.gatenamee = '';
+      state.gatenamee = "";
       getStudent();
     };
     const handleStuChange = (value) => {
       console.log(value);
-      if(value == 2) {state.visiblene = true}
-      if(value == 3 ) { deleteStu() }
+      if (value == 2) {
+        state.visiblene = true;
+      }
+      if (value == 3) {
+        deleteStu();
+      }
     };
     const deleteStu = () => {
-      if(state.selectedRowKeys.length == 0) {
+      if (state.selectedRowKeys.length == 0) {
         message.warning("请选择成员");
-        return }
-      let obj = {
-        routerId:100,
-        studentIds:state.selectedRowKeys,
+        return;
       }
-      api.delStudent(obj).then((res) => {
-        console.log(res);
-        getStudent();
-        message.success("批量删除成功")
-      }).catch(err => {
-        message.error("批量删除失败"+err);
-        console.log(err)
-      })
+      let obj = {
+        routerId: 100,
+        studentIds: state.selectedRowKeys,
+      };
+      api
+        .delStudent(obj)
+        .then((res) => {
+          console.log(res);
+          getStudent();
+          message.success("批量删除成功");
+        })
+        .catch((err) => {
+          message.error("批量删除失败" + err);
+          console.log(err);
+        });
     };
     const pageChange = (value) => {
       state.currentPage = value;
       getStudent();
-    }
+    };
     const setconfig = () => {
       let obj = {
-        "autoJoinFlag": 0,
-          "deptBoList": [
-            {
-              "deptId": 0,
-              "deptName": ""
-            }
-          ],
-          "preLearnFlag": 0,
-          "previewFlag": 0,
-          "routerId": 0,
-          "showFlag": 0
-      }
-      api.setConfig(obj).then((res) => {
-        message.success("编辑成功")
-        console.log(res);
-      }).catch(err => {
-        console.log(err);
-        message.error("编辑失败")
-      })
-    }
+        autoJoinFlag: 0,
+        deptBoList: [
+          {
+            deptId: 0,
+            deptName: "",
+          },
+        ],
+        preLearnFlag: 0,
+        previewFlag: 0,
+        routerId: 0,
+        showFlag: 0,
+      };
+      api
+        .setConfig(obj)
+        .then((res) => {
+          message.success("编辑成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+          message.error("编辑失败");
+        });
+    };
     return {
       ...toRefs(state),
       ...toRefs(levelList),
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 6780fa61..bf7a8a35 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -194,7 +194,7 @@
                 <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
               </div>
               <div class="line"></div>
-              <router-link to="/leveladd">
+              <router-link to="/manage/leveladd">
                 <div style="display: flex">
                   <img
                     class="img2"
@@ -758,7 +758,7 @@
                 <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
               </div>
               <div class="line"></div>
-              <router-link to="/leveladd">
+              <router-link to="/manage/leveladd">
                 <div style="display: flex">
                   <img
                     class="img2"
diff --git a/src/views/learningpath/LevelCheck.vue b/src/views/learningpath/LevelCheck.vue
index 707acf60..fc143792 100644
--- a/src/views/learningpath/LevelCheck.vue
+++ b/src/views/learningpath/LevelCheck.vue
@@ -31,7 +31,7 @@
           </div>
         </div>
         <div class="lne"></div>
-        <router-link to="/leveladd">
+        <router-link to="/manage/leveladd">
           <div class="return">
             <div class="im"></div>
             <div class="fan">返回</div>
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 57526254..0b5c8b12 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/projectmanage"
+        to="/manage/projectmanage"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -408,7 +408,7 @@ export default {
 
     if (routers.query.name == undefined) {
       router.push({
-        path: "/projectmanage",
+        path: "/manage/projectmanage",
       });
     }
 
@@ -481,7 +481,7 @@ export default {
     const backPage = () => {
       setTimeout(() => {
         router.push({
-          path: "/projectmanage",
+          path: "/manage/projectmanage",
         });
       }, 400);
     };
@@ -800,7 +800,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/projectmanage",
+                  path: "/manage/projectmanage",
                 });
               }, 1000);
             } else {
@@ -855,7 +855,7 @@ export default {
               message.success("创建成功");
               setTimeout(() => {
                 router.push({
-                  path: "/taskpage",
+                  path: "/manage/taskpage",
                   query: { id: res.data.data.projectId },
                 });
               }, 1000);
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index a6f79a0c..851e7e8e 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/templatelibrary"
+        <router-link to="/manage/templatelibrary"
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -55,7 +55,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
               <button class="btn" @click="showFaceIn">批量面授报名</button>
-              <router-link to="/taskadd" class="edit">
+              <router-link to="/manage/taskadd" class="edit">
                 <img
                   class="editimg"
                   src="../../assets/images/projectadd/edit.png"
@@ -200,7 +200,7 @@
                               : 'none',
                         }"
                       >
-                      <!-- 考勤 -->
+                        <!-- 考勤 -->
                       </div>
                       <div
                         class="operation"
@@ -278,7 +278,7 @@
             <hr color="#E8E8E8" />
             <div class="ntc_body">
               <div class="ntc_switch">
-                <a-switch v-model:checked="checked" @click="changeopclo"  />
+                <a-switch v-model:checked="checked" @click="changeopclo" />
                 <div
                   class="opclo"
                   :style="{ display: hideshow ? 'block' : 'none' }"
@@ -385,165 +385,217 @@
           <div class="split"></div>
           <a-tabs>
             <a-tab-pane key="1" tab="编辑">
-          <div class="setting">
-            <div class="set_tit">
-              <span>基本信息</span>
-              <span class="editBtn" @click="toEdit">编辑</span>
-            </div>
-            <hr color="#E8E8E8" />
-            <div class="set_body">
-              <div class="set_content">
-                <div class="setc_name"><span>模板名称：</span></div>
-                <div class="setc_main">
-                  <a-input v-model:value="formData.name"
-                  :bordered="isEdit" :disabled="!isEdit"
-                  style="width:300px;"
-                  ></a-input>
+              <div class="setting">
+                <div class="set_tit">
+                  <span>基本信息</span>
+                  <span class="editBtn" @click="toEdit">编辑</span>
+                </div>
+                <hr color="#E8E8E8" />
+                <div class="set_body">
+                  <div class="set_content">
+                    <div class="setc_name"><span>模板名称：</span></div>
+                    <div class="setc_main">
+                      <a-input
+                        v-model:value="formData.name"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        style="width: 300px"
+                      ></a-input>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>封面图：</span></div>
+                    <div class="setc_main">
+                      <a-upload
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/api/file/upload"
+                        @change="handleChange"
+                        :disabled="!isEdit"
+                      >
+                        <img
+                          src="@/assets/images/projectadd/picture.png"
+                          alt=""
+                        />
+                      </a-upload>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>模板时间：</span></div>
+                    <div class="setc_main">
+                      <a-range-picker
+                        v-model:value="formData.time"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                      />
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目经理：</span></div>
+                    <div class="setc_main">
+                      <a-select
+                        v-model:value="formData.manager"
+                        mode="multiple"
+                        placeholder="请选择项目经理"
+                        :size="large"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        style="width: 200px; color: #999999"
+                        :options="managerOptions"
+                      ></a-select>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>资源归属：</span></div>
+                    <div class="setc_main">
+                      <a-select
+                        v-model:value="formData.sourceBelongId"
+                        placeholder="请选择资源归属"
+                        :size="large"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        style="width: 200px; color: #999999"
+                        :options="sourceBelongOptions"
+                      ></a-select>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>模板说明：</span></div>
+                    <div class="setc_main">
+                      <a-input
+                        v-model:value="formData.remark"
+                        style="width: 300px"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                      ></a-input>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main" @click="changecheck2">
+                      <a-radio
+                        v-model:checked="formData.courseSyncFlag"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        ><span style="color: #333333"
+                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                        ></a-radio
+                      >
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目级别：</span></div>
+                    <div class="setc_main">
+                      <a-select
+                        v-model:value="formData.level"
+                        placeholder="请选择项目级别"
+                        :size="large"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        style="width: 200px; color: #999999"
+                        :options="levelOptions"
+                      ></a-select>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>培训分类：</span></div>
+                    <div class="setc_main">
+                      <a-select
+                        v-model:value="formData.systemId"
+                        placeholder="请选择培训分类"
+                        :size="large"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        style="width: 200px; color: #999999"
+                        :options="systemOptions"
+                      ></a-select>
+                    </div>
+                  </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>是否BOEU实施：</span></div>
+                    <div class="setc_main" @click="changecheck3">
+                      <a-radio
+                        v-model:checked="formData.boeFlag"
+                        :bordered="isEdit"
+                        :disabled="!isEdit"
+                        ><span style="color: #333333">BOEU实施</span></a-radio
+                      >
+                    </div>
+                  </div>
+                  <div v-if="isEdit" style="transform: translateX(50%)">
+                    <a-button
+                      @click="cancelEdit"
+                      style="background-color: #f9f9f9"
+                      >取消</a-button
+                    >
+                    <a-button
+                      @click="confirmEdit"
+                      style="background-color: #f5faff"
+                      >保存</a-button
+                    >
+                  </div>
                 </div>
               </div>
-              <div class="set_content">
-                <div class="setc_name"><span>封面图：</span></div>
-                <div class="setc_main">
-                  <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  action="/api/file/upload"
-                  @change="handleChange"
-                  :disabled="!isEdit"
-                >
-                <img src="@/assets/images/projectadd/picture.png" alt="" />
-                </a-upload>
-                  
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>模板时间：</span></div>
-                <div class="setc_main">
-                  <a-range-picker v-model:value="formData.time"
-                  
-                  :bordered="isEdit" :disabled="!isEdit" />
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目经理：</span></div>
-                <div class="setc_main">
-                  <a-select
-                    v-model:value="formData.manager" mode="multiple"
-                    placeholder="请选择项目经理"
-                    :size="large" :bordered="isEdit" :disabled="!isEdit"
-                    style="width: 200px;color: #999999;" :options="managerOptions"
-                  ></a-select>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>资源归属：</span></div>
-                <div class="setc_main">
-                  <a-select
-                    v-model:value="formData.sourceBelongId"
-                    placeholder="请选择资源归属"
-                    :size="large" :bordered="isEdit" :disabled="!isEdit"
-                    style="width: 200px;color: #999999;" :options="sourceBelongOptions"
-                  ></a-select>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>模板说明：</span></div>
-                <div class="setc_main">
-                  <a-input v-model:value="formData.remark"
-                  style="width:300px;"
-                  :bordered="isEdit" :disabled="!isEdit"
-                  ></a-input>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>同步学习记录：</span></div>
-                <div class="setc_main" @click="changecheck2">
-                  <a-radio v-model:checked="formData.courseSyncFlag"
-                  :bordered="isEdit" :disabled="!isEdit"
-                    ><span style="color: #333333"
-                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                    ></a-radio
-                  >
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>项目级别：</span></div>
-                <div class="setc_main">
-                  <a-select
-                    v-model:value="formData.level"
-                    placeholder="请选择项目级别"
-                    :size="large" :bordered="isEdit" :disabled="!isEdit"
-                    style="width: 200px;color: #999999;" :options="levelOptions"
-                  ></a-select>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>培训分类：</span></div>
-                <div class="setc_main">
-                  <a-select
-                    v-model:value="formData.systemId"
-                    placeholder="请选择培训分类"
-                    :size="large" :bordered="isEdit" :disabled="!isEdit"
-                    style="width: 200px;color: #999999;" :options="systemOptions"
-                  ></a-select>
-                </div>
-              </div>
-              <div class="set_content">
-                <div class="setc_name"><span>是否BOEU实施：</span></div>
-                <div class="setc_main" @click="changecheck3">
-                  <a-radio v-model:checked="formData.boeFlag"
-                  :bordered="isEdit" :disabled="!isEdit"
-                    ><span style="color: #333333">BOEU实施</span></a-radio
-                  >
-                </div>
-              </div>
-              <div  v-if="isEdit" style="transform: translateX(50%)">
-                <a-button @click="cancelEdit" style="background-color: #f9f9f9">取消</a-button>
-                <a-button  @click="confirmEdit" style="background-color: #f5faff">保存</a-button>
-            </div>
-            </div>
-          </div>
             </a-tab-pane>
             <a-tab-pane key="2" tab="共享文档">
               <div class="sametab">
-              <div class="Gcon">
-                <div class="pad"></div>
-                <div class="Gin">
-                  <div class="headone" style="transform: translateX(30px)">
-                    <div class="box"></div>
-                    <div class="onetitle">上传共享文档</div>
-                    <div class="oneedi">
-                      <a-switch v-model:checked="docChecked" ></a-switch>
+                <div class="Gcon">
+                  <div class="pad"></div>
+                  <div class="Gin">
+                    <div class="headone" style="transform: translateX(30px)">
+                      <div class="box"></div>
+                      <div class="onetitle">上传共享文档</div>
+                      <div class="oneedi">
+                        <a-switch v-model:checked="docChecked"></a-switch>
+                      </div>
+                    </div>
+                    <div class="btnbox" style="margin: 20px">
+                      <a-upload
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/api/file/upload"
+                        @change="handleChange"
+                      >
+                        <span
+                          class="xkbtn"
+                          style="cursor: pointer; font-size: 17px"
+                          >上传</span
+                        >
+                        <img
+                          src="@/assets/images/basicinfo/cloud.png"
+                          style="cursor: pointer; width: 34px; height: 34px"
+                          alt=""
+                        />
+                      </a-upload>
+                      <div class="btnbox" style="margin: 20px">
+                        <span style="color: #999999">
+                          支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                        </span>
+                      </div>
+                      <div
+                        v-for="item in docList"
+                        :key="item.src"
+                        class="docListStyle"
+                      >
+                        <img
+                          src="@/assets/images/basicinfo/download.png"
+                          style="
+                            cursor: pointer;
+                            width: 40px;
+                            height: 40px;
+                            margin-right: 40px;
+                          "
+                          alt=""
+                        />
+                        <span style="font: oblique 16px Sans-serif">{{
+                          item.name
+                        }}</span>
+                        <span style="color: #4ea6ff; float: right">删除</span>
+                      </div>
                     </div>
                   </div>
-                  <div class="btnbox" style="margin:20px;">
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  action="/api/file/upload"
-                  @change="handleChange"
-                >
-                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
-                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
-                  width:34px;height:34px;
-                  " alt="">
-                </a-upload>
-                <div class="btnbox" style="margin:20px;">
-                <span style="color: #999999">
-                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
-                </span>
-              </div>
-              <div v-for="item in docList" :key="item.src" class="docListStyle">
-                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
-                  width:40px;height:40px;margin-right:40px;
-                  " alt="">
-                <span style="font: oblique   16px Sans-serif">{{item.name}}</span> 
-                <span style="color: #4ea6ff;float:right;">删除</span>
-              </div>
-              </div>
                 </div>
               </div>
-            </div>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
@@ -590,9 +642,9 @@
 </template>
 
 <script>
-import { ref, reactive, defineComponent, toRefs, onMounted} from "vue";
+import { ref, reactive, defineComponent, toRefs, onMounted } from "vue";
 import { message } from "ant-design-vue";
-import * as api from "@/api/indexTemplate"
+import * as api from "@/api/indexTemplate";
 import { useRouter } from "vue-router";
 export default defineComponent({
   name: "LibraryAdd",
@@ -720,27 +772,27 @@ export default defineComponent({
         },
       ],
       // 模板编辑列表
-      managerOptions:[
-        { value: "李俊国"},
-        { value: "将小米"},
-        { value: "刘孟君"},
+      managerOptions: [
+        { value: "李俊国" },
+        { value: "将小米" },
+        { value: "刘孟君" },
       ],
-      sourceBelongOptions:[
-        { value: "项目一"},
-        { value: "项目二"},
-        { value: "项目三"},
+      sourceBelongOptions: [
+        { value: "项目一" },
+        { value: "项目二" },
+        { value: "项目三" },
       ],
-      levelOptions:[
-        { value: "集团级"},
-        { value: "组织级"},
-        { value: "现地级"},
-        { value: "部门级"},
+      levelOptions: [
+        { value: "集团级" },
+        { value: "组织级" },
+        { value: "现地级" },
+        { value: "部门级" },
       ],
-      systemOptions:[
-        { value: "集团级"},
-        { value: "组织级"},
-        { value: "现地级"},
-        { value: "部门级"},
+      systemOptions: [
+        { value: "集团级" },
+        { value: "组织级" },
+        { value: "现地级" },
+        { value: "部门级" },
       ],
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
@@ -752,7 +804,7 @@ export default defineComponent({
       checked: true,
       checked2: false,
       checked3: false,
-      docChecked:true,
+      docChecked: true,
       value3: false,
       value4: false,
       hideshow: true,
@@ -760,22 +812,22 @@ export default defineComponent({
       score2: 5,
       edit: true,
       // 共享文档列表
-      docList:[
+      docList: [
         {
-          name:'测试文档1.doc',
-          src:"",
+          name: "测试文档1.doc",
+          src: "",
         },
         {
-          name:'测试文档2.doc',
-          src:"",
+          name: "测试文档2.doc",
+          src: "",
         },
         {
-          name:'测试文档3.doc',
-          src:"",
-        }
+          name: "测试文档3.doc",
+          src: "",
+        },
       ],
       // 基本信息
-      formData:{
+      formData: {
         name: "123",
         time: "",
         manager: "建国",
@@ -786,7 +838,7 @@ export default defineComponent({
         systemId: null,
         boeFlag: false,
       },
-      isEdit:false, // 是否处于编辑状态
+      isEdit: false, // 是否处于编辑状态
     });
     const value = ref("");
     const value2 = ref("");
@@ -807,153 +859,182 @@ export default defineComponent({
     };
     const confirmEdit = () => {
       state.isEdit = false;
-      editTemplate()
+      editTemplate();
       getDetail();
     };
-    onMounted(() => {getDetail()});
+    onMounted(() => {
+      getDetail();
+    });
     // 获取详情
     const getDetail = () => {
-      api.templateDetail(0).then(res => {
-        console.log(res)
-        state.formData.name = res.data.data.projectInfo.name
-        state.formData.time = res.data.data.projectInfo.startTime+res.data.data.projectInfo.endTime;
-        state.formData.manager = res.data.data.projectInfo.manager
-        state.formData.sourceBelongId = res.data.data.projectInfo.sourceBelongId
-        state.formData.remark = res.data.data.stageList.remark
-        state.formData.courseSyncFlag = res.data.data.projectInfo.courseSyncFlag
-        state.formData.level = res.data.data.projectInfo.level
-        state.formData.systemId = res.data.data.projectInfo.systemId
-        state.formData.boeFlag = res.data.data.projectInfo.boeFlag
-        state.value2 = res.data.data.projectInfo.notice
-      }).catch(err => {
-        message.error("操作失败"+err)
-        console.log(err)
-      })
-    }
+      api
+        .templateDetail(0)
+        .then((res) => {
+          console.log(res);
+          state.formData.name = res.data.data.projectInfo.name;
+          state.formData.time =
+            res.data.data.projectInfo.startTime +
+            res.data.data.projectInfo.endTime;
+          state.formData.manager = res.data.data.projectInfo.manager;
+          state.formData.sourceBelongId =
+            res.data.data.projectInfo.sourceBelongId;
+          state.formData.remark = res.data.data.stageList.remark;
+          state.formData.courseSyncFlag =
+            res.data.data.projectInfo.courseSyncFlag;
+          state.formData.level = res.data.data.projectInfo.level;
+          state.formData.systemId = res.data.data.projectInfo.systemId;
+          state.formData.boeFlag = res.data.data.projectInfo.boeFlag;
+          state.value2 = res.data.data.projectInfo.notice;
+        })
+        .catch((err) => {
+          message.error("操作失败" + err);
+          console.log(err);
+        });
+    };
     // 编辑项目模板
     const editTemplate = () => {
       let obj = {
-        "beginTime": state.formData.time,
-        "boeFlag": state.formData.boeFlag,
-        "category": 0,
-        "courseSyncFlag": state.formData.courseSyncFlag,
-        "endTime": state.formData.time,
-        "level": state.formData.level,
-        "manager": state.formData.manager,
-        "managerId": "",
-        "name": state.formData.name,
-        "notice": "",
-        "noticeFlag": 0,
-        "picUrl": "",
-        "projectTemplateId": 0,
-        "remark": state.formData.remark,
-        "sourceBelongId": state.formData.sourceBelongId,
-        "status": 0,
-        "systemId": state.formData.systemId
+        beginTime: state.formData.time,
+        boeFlag: state.formData.boeFlag,
+        category: 0,
+        courseSyncFlag: state.formData.courseSyncFlag,
+        endTime: state.formData.time,
+        level: state.formData.level,
+        manager: state.formData.manager,
+        managerId: "",
+        name: state.formData.name,
+        notice: "",
+        noticeFlag: 0,
+        picUrl: "",
+        projectTemplateId: 0,
+        remark: state.formData.remark,
+        sourceBelongId: state.formData.sourceBelongId,
+        status: 0,
+        systemId: state.formData.systemId,
       };
-      api.templateEdit(obj).methods(obj).then(res => {
-        message.success("编辑成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("编辑失败"+err)
-        console.log(err)
-      })
-    }
+      api
+        .templateEdit(obj)
+        .methods(obj)
+        .then((res) => {
+          message.success("编辑成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("编辑失败" + err);
+          console.log(err);
+        });
+    };
     // 发布公告
     const addNotice = () => {
       let obj = {
-        "beginTime": 0,
-        "boeFlag": 0,
-        "category": 0,
-        "courseSyncFlag": 0,
-        "endTime": 0,
-        "level": 0,
-        "manager": "",
-        "managerId": "",
-        "name": "",
-        "notice": state.value2,
-        "noticeFlag": 0,
-        "picUrl": "",
-        "projectTemplateId": 0,
-        "remark": "",
-        "sourceBelongId": 0,
-        "status": 0,
-        "systemId": 0
+        beginTime: 0,
+        boeFlag: 0,
+        category: 0,
+        courseSyncFlag: 0,
+        endTime: 0,
+        level: 0,
+        manager: "",
+        managerId: "",
+        name: "",
+        notice: state.value2,
+        noticeFlag: 0,
+        picUrl: "",
+        projectTemplateId: 0,
+        remark: "",
+        sourceBelongId: 0,
+        status: 0,
+        systemId: 0,
       };
-      api.templateEdit(obj).methods(obj).then(res => {
-        message.success("公告发布成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("公告发布失败"+err)
-        console.log(err)
-      })
-    }
+      api
+        .templateEdit(obj)
+        .methods(obj)
+        .then((res) => {
+          message.success("公告发布成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("公告发布失败" + err);
+          console.log(err);
+        });
+    };
     // 删除阶段
     const stateDel = (id) => {
-      api.deleteStage(id).then(res => {
-        message.success("删除阶段成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("删除阶段失败"+err)
-        console.log(err)
-      })
-    }
-    
+      api
+        .deleteStage(id)
+        .then((res) => {
+          message.success("删除阶段成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("删除阶段失败" + err);
+          console.log(err);
+        });
+    };
+
     // 删除任务
     const taskDel = (id) => {
-      api.deleteTask(id).then(res => {
-      message.success("删除任务成功")
-      console.log(res)
-    }).catch(err => {
-      message.error("删除任务失败"+err)
-      console.log(err)
-    })
-    }
+      api
+        .deleteTask(id)
+        .then((res) => {
+          message.success("删除任务成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("删除任务失败" + err);
+          console.log(err);
+        });
+    };
     const toEdit = () => {
       routered.push({
-          path: "/templateAdd",
-          query: {
-            projectId: state.projectId,
-            name: state.name,
-          },
-        });
-    }
-    // 新建或编辑阶段 
+        path: "/manage/templateAdd",
+        query: {
+          projectId: state.projectId,
+          name: state.name,
+        },
+      });
+    };
+    // 新建或编辑阶段
     const stateEdit = () => {
-      let obj={
-        "name": "",
-        "projectTemplateId": 0,
-        "remark": "",
-        "stageId": 0
-      }
-      api.editStagek(obj).then(res => {
-        message.success("编辑阶段成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("编辑阶段失败"+err)
-        console.log(err)
-      })
-    }
+      let obj = {
+        name: "",
+        projectTemplateId: 0,
+        remark: "",
+        stageId: 0,
+      };
+      api
+        .editStagek(obj)
+        .then((res) => {
+          message.success("编辑阶段成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("编辑阶段失败" + err);
+          console.log(err);
+        });
+    };
     //新建或编辑阶段任务
     const taskEdit = () => {
       let obj = {
-        "courseId": 0,
-        "duration": 0,
-        "flag": true,
-        "name": "",
-        "projectTaskId": 0,
-        "projectTemplateId": 0,
-        "stageId": 0,
-        "type": 0
-      }
-      api.editTask(obj).then(res => {
-        message.success("编辑任务成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("编辑任务失败"+err)
-        console.log(err)
-      })
-    }
+        courseId: 0,
+        duration: 0,
+        flag: true,
+        name: "",
+        projectTaskId: 0,
+        projectTemplateId: 0,
+        stageId: 0,
+        type: 0,
+      };
+      api
+        .editTask(obj)
+        .then((res) => {
+          message.success("编辑任务成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("编辑任务失败" + err);
+          console.log(err);
+        });
+    };
     return {
       ...toRefs(state),
       value,
@@ -982,11 +1063,11 @@ export default defineComponent({
 </script>
 <style lang="scss">
 .editBtn {
-      float:right; 
-      margin-right: 150px;
-      color:#4ea6ff;
-      cursor: pointer;
-    }
+  float: right;
+  margin-right: 150px;
+  color: #4ea6ff;
+  cursor: pointer;
+}
 .clearfix:before,
 .clearfix:after {
   content: " ";
@@ -1029,7 +1110,7 @@ export default defineComponent({
         margin-top: 20px;
       }
     }
-    
+
     @media screen and (max-width: 1030px) {
       .imgfor {
         margin-left: 20px;
@@ -1156,15 +1237,15 @@ export default defineComponent({
     }
 
     .split {
-        width: 100%;
-        height: 20px;
-        background-color: #edf0f5;
-      }
-      .docListStyle {
-        display: flex;
-        width: 300px !important;
-        justify-content: space-around;
-      }
+      width: 100%;
+      height: 20px;
+      background-color: #edf0f5;
+    }
+    .docListStyle {
+      display: flex;
+      width: 300px !important;
+      justify-content: space-around;
+    }
     .taskBox {
       .onerow {
         //width: 100%;
@@ -1393,14 +1474,12 @@ export default defineComponent({
     }
 
     .notice {
-      
       .ntc_tit {
-        padding-top:22px;
+        padding-top: 22px;
         margin-left: 34px;
         font-size: 18px;
         font-weight: 500;
         color: #232425;
-        
       }
       .ntc_body {
         margin-left: 34px;
@@ -1422,7 +1501,6 @@ export default defineComponent({
             .btnarea {
               display: flex;
               justify-content: flex-end;
-              
             }
             .area_btn {
               width: 100px;
@@ -1457,7 +1535,7 @@ export default defineComponent({
     }
 
     .projectscore {
-      padding-top:22px;
+      padding-top: 22px;
       .pjc_tit {
         margin-left: 34px;
         font-size: 18px;
@@ -1536,7 +1614,7 @@ export default defineComponent({
     }
 
     .setting {
-      padding-top:22px;
+      padding-top: 22px;
       .set_tit {
         margin-left: 34px;
         font-size: 18px;
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 72b3903d..900c780c 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/projectmanage"
+        to="/manage/projectmanage"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -530,7 +530,7 @@ export default {
       storage.remove("projectAddId");
       setTimeout(() => {
         router.push({
-          path: "/projectmanage",
+          path: "/manage/projectmanage",
         });
       }, 400);
     };
@@ -993,7 +993,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/projectmanage",
+                  path: "/manage/projectmanage",
                 });
               }, 1000);
             } else {
@@ -1048,7 +1048,7 @@ export default {
               message.success("创建成功");
               setTimeout(() => {
                 router.push({
-                  path: "/taskpage",
+                  path: "/manage/taskpage",
                   query: { id: res.data.data.projectId },
                 });
               }, 1000);
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 950929d5..2544ae97 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -259,7 +259,7 @@
             </div>
           </div>
           <div class="modalMain">
-            <router-link to="/projectadd">
+            <router-link to="/manage/projectadd">
               <div
                 class="taskbox"
                 style="
@@ -1513,7 +1513,7 @@ export default {
     const createChildProject = () => {
       console.log(state.currentProjectId);
       router.push({
-        path: "/sonproject",
+        path: "/manage/sonproject",
         query: {
           projectId: state.currentProjectId,
           name: state.currentProjectName,
@@ -2182,7 +2182,7 @@ export default {
                   >
                     {/* 
 										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
+											<router-link to="/manage/taskpage">基础信息</router-link>
 										</a-select-option>
 										<a-select-option value="存为模版" label="存为模版">
 											<div
@@ -2280,7 +2280,7 @@ export default {
                   >
                     {/* 
 										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
+											<router-link to="/manage/taskpage">基础信息</router-link>
 										</a-select-option>
 										<a-select-option value="存为模版" label="存为模版">
 											<div
@@ -2368,7 +2368,7 @@ export default {
                   >
                     {/* 
 										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
+											<router-link to="/manage/taskpage">基础信息</router-link>
 										</a-select-option>
 										<a-select-option value="存为模版" label="存为模版">
 											<div
@@ -2474,7 +2474,7 @@ export default {
                 <div
                   onClick={() => {
                     router.push({
-                      path: "/classadd",
+                      path: "/manage/classadd",
                       query: {
                         projectId: value.record.projectId,
                         name: value.record.name,
@@ -2482,7 +2482,7 @@ export default {
                     });
                   }}
                   style={{ cursor: "pointer" }}
-                  to="/classadd"
+                  to="/manage/classadd"
                   class="operation3"
                 >
                   创建班级
@@ -2566,7 +2566,7 @@ export default {
                   </a-select>
                 </div>
 
-                <router-link to="/classadd" class="operation3">
+                <router-link to="/manage/classadd" class="operation3">
                   创建班级
                 </router-link>
                 <div class="tableSelect">
@@ -2683,7 +2683,7 @@ export default {
                     }
                     if (value.record.parentId == "0") {
                       router.push({
-                        path: "/projectadd",
+                        path: "/manage/projectadd",
                         query: {
                           projectId: value.record.projectId,
                           name: value.record.name,
@@ -2692,7 +2692,7 @@ export default {
                     } else {
                       if (value.record.isbj) {
                         router.push({
-                          path: "/classadd",
+                          path: "/manage/classadd",
                           query: {
                             projectId: value.record.projectId,
                             name: value.record.paraentName,
@@ -2701,7 +2701,7 @@ export default {
                         });
                       } else {
                         router.push({
-                          path: "/sonproject",
+                          path: "/manage/sonproject",
                           query: {
                             projectId: value.record.projectId,
                             name: value.record.paraentName,
@@ -2728,7 +2728,7 @@ export default {
                 //     }
                 //     if (value.record.parentId == "0") {
                 //       router.push({
-                //         path: "/projectadd",
+                //         path: "/manage/projectadd",
                 //         query: {
                 //           projectId: value.record.projectId,
                 //           name: value.record.name,
@@ -2738,7 +2738,7 @@ export default {
                 //     } else {
                 //       if (value.record.isbj) {
                 //         router.push({
-                //           path: "/classadd",
+                //           path: "/manage/classadd",
                 //           query: {
                 //             projectId: value.record.projectId,
                 //             name: value.record.paraentName,
@@ -2748,7 +2748,7 @@ export default {
                 //         });
                 //       } else {
                 //         router.push({
-                //           path: "/sonproject",
+                //           path: "/manage/sonproject",
                 //           query: {
                 //             projectId: value.record.projectId,
                 //             name: value.record.paraentName,
@@ -2878,7 +2878,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/manage/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2937,7 +2937,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/manage/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2984,7 +2984,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/manage/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2992,7 +2992,7 @@ export default {
                         基础信息
                       </div>
                       {/**
-											<router-link to="/taskpage">基础信息</router-link>
+											<router-link to="/manage/taskpage">基础信息</router-link>
 											*/}
                     </a-select-option>
                   </a-select>
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index c23768b2..7b1dfa20 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -1,55 +1,89 @@
 <!---- 创建单层子项目页面 --->
 <template>
-	<div class="sonproject">
-		<div class="header">
-			<span class="title">创建/编辑单层子项目</span>
-			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
-				<span class="return"></span><span class="returntext">返回</span>
-			</div>
-		</div>
-		<div class="content">
-			<div class="main">
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目归属</div>
-					</div>
-					<div class="in">
-						<div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
-							{{ projectAscription }}
-						</div>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">子项目名称</div>
-					</div>
-					<div class="in">
-						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">分类</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-							@change="classificationChange" allowClear showSearch :disabled="viewDetail ? true : false">
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">封面图</div>
-					</div>
-					<div class="box" style="
+  <div class="sonproject">
+    <div class="header">
+      <span class="title">创建/编辑单层子项目</span>
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/manage/projectmanage"
+        class="goback"
+      >
+        <span class="return"></span><span class="returntext">返回</span>
+      </div>
+    </div>
+    <div class="content">
+      <div class="main">
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目归属</div>
+          </div>
+          <div class="in">
+            <div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
+              {{ projectAscription }}
+            </div>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">子项目名称</div>
+          </div>
+          <div class="in">
+            <a-input
+              v-model:value="projectName"
+              placeholder="请输入项目名称"
+              show-count
+              :maxlength="30"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">分类</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect"
+              placeholder="四个养成"
+              style="width: 100%"
+              :options="classifyList"
+              @change="classificationChange"
+              allowClear
+              showSearch
+              :disabled="viewDetail ? true : false"
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">封面图</div>
+          </div>
+          <div
+            class="box"
+            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -57,128 +91,218 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            ">
-						<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" :disabled="viewDetail ? true : false">
-							<img style="
+            "
+          >
+            <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"
+              :disabled="viewDetail ? true : false"
+            >
+              <img
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                " 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="box1"></div>
-								<div class="box2"></div>
-								<!-- <div class="ant-upload-text"></div> -->
-							</div>
-						</a-upload>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">子项目时间</div>
-					</div>
+                "
+                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="box1"></div>
+                <div class="box2"></div>
+                <!-- <div class="ant-upload-text"></div> -->
+              </div>
+            </a-upload>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">子项目时间</div>
+          </div>
 
-					<div class="in">
-						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
-							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">子项目经理</div>
-					</div>
-					<div class="in">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-							@change="classificationChange1" allowClear showSearch :disabled="viewDetail ? true : false">
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">资源归属</div>
-					</div>
+          <div class="in">
+            <a-range-picker
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="rangevalue"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              @change="onRangeChange"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">子项目经理</div>
+          </div>
+          <div class="in">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              :value="classifySelect1"
+              mode="multiple"
+              placeholder="请选择项目经理"
+              style="width: 100%"
+              :options="classifyList1"
+              @change="classificationChange1"
+              allowClear
+              showSearch
+              :disabled="viewDetail ? true : false"
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">资源归属</div>
+          </div>
 
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
-							@change="classificationChange2" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname" style="margin-top: 13px">项目说明</div>
-					</div>
-					<div class="in">
-						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" :disabled="viewDetail ? true : false"/>
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname">同步学习记录</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked" v-model:checked="checked" :disabled="viewDetail ? true : false"><span style="
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              placeholder="自动带出 可修改"
+              :options="classifyList2"
+              @change="classificationChange2"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">项目说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-radio
+              @click="changeChecked"
+              v-model:checked="checked"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                " >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目级别</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
-							placeholder="集团级/组织级/现地级/部门级" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">培训分类</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
-							placeholder="集团级/组织级/现地级/部门级" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">是否BOEU实施</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked1" v-model:checked="checked1" :disabled="viewDetail ? true : false"><span style="
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect3"
+              :options="classifyList3"
+              @change="classificationChange3"
+              placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训分类</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect4"
+              :options="classifyList4"
+              @change="classificationChange4"
+              placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio
+              @click="changeChecked1"
+              v-model:checked="checked1"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">BOEU实施</span></a-radio>
-					</div>
-				</div>
-				<!-- <div class="name name2">
+                "
+                >BOEU实施</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <!-- <div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">附件</div>
@@ -197,866 +321,887 @@
 						</div>
 					</div>
 				</div> -->
-			</div>
-			<div class="template">
-				<div class="name">
-					<div class="inname" style="width: 50px">模版</div>
-					<div class="in select" style="margin-left: 2px">
-						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5" >
-						</a-select>
-						<a-select v-else :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="footer">
-			<div class="btn">
-				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-				<a-button @click="backPage" class="btn2">取消</a-button>
-			</div>
-		</div>
-	</div>
+      </div>
+      <div class="template">
+        <div class="name">
+          <div class="inname" style="width: 50px">模版</div>
+          <div class="in select" style="margin-left: 2px">
+            <a-select
+              v-if="isEdit"
+              disabled="true"
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+            <a-select
+              v-else
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <div class="btn">
+        <a-button v-on:click="createProject" type="primary" class="btn1"
+          >确定</a-button
+        >
+        <a-button @click="backPage" class="btn2">取消</a-button>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import * as api from "../../api/index";
-import { toDate } from '../../api/method'
+import { toDate } from "../../api/method";
 
 export default {
-	name: "projectAdd",
-	setup() {
-		// 编辑页面跳转过来时候，自动填充表格
-		const routers = useRoute();
-		const router = useRouter();
-		const isEdit = ref(false);
-		let peojectID = "";
-		let paraentID = "";
+  name: "projectAdd",
+  setup() {
+    // 编辑页面跳转过来时候，自动填充表格
+    const routers = useRoute();
+    const router = useRouter();
+    const isEdit = ref(false);
+    let peojectID = "";
+    let paraentID = "";
 
-		const state = reactive({
-			classifySelect: null,
-			classifySelectId: null,
-			checked: false,
-			checked1: false,
-			valueE: null,
-			valueE1: null,
-			valueE2: null,
-			classifySelect1: [],
-			classifySelect2: [],
-			classifySelect3: [],
-			classifySelect4: [],
-			rangevalue: [],
-			projectAscription: "",
-			viewDetail:routers.query.viewDetail?routers.query.viewDetail:null
-		});
+    const state = reactive({
+      classifySelect: null,
+      classifySelectId: null,
+      checked: false,
+      checked1: false,
+      valueE: null,
+      valueE1: null,
+      valueE2: null,
+      classifySelect1: [],
+      classifySelect2: [],
+      classifySelect3: [],
+      classifySelect4: [],
+      rangevalue: [],
+      projectAscription: "",
+      viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+    });
 
-		if (routers.query.name == undefined) {
-			router.push({
-				path: "/projectmanage"
-			});
-		}
+    if (routers.query.name == undefined) {
+      router.push({
+        path: "/manage/projectmanage",
+      });
+    }
 
-		peojectID = routers.query.projectId;
-		state.projectAscription = routers.query.name;
+    peojectID = routers.query.projectId;
+    state.projectAscription = routers.query.name;
 
-		if (routers.query.edit !== undefined) {
-			isEdit.value = true;
-			// 需要编辑
-			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
-				if (res.status == 200 && res.data.code == 200) {
-					let info = res.data.data.projectInfo;
-					console.log(info)
-					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-					projectName.value = info.name;
-					state.classifySelect = classifyList.value[1]; // info.category
-					imageUrl.value = info.picUrl;
+    if (routers.query.edit !== undefined) {
+      isEdit.value = true;
+      // 需要编辑
+      api
+        .getProjectDetail({ projectId: routers.query.projectId })
+        .then((res) => {
+          if (res.status == 200 && res.data.code == 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
 
-					let start = toDate(info.beginTime / 1000, 'YYYY/MM/DD');
-					let end = toDate(info.endTime / 1000, 'YYYY/MM/DD');
-					state.rangevalue = [
-						dayjs(start, 'YYYY/MM/DD'),
-						dayjs(end, 'YYYY/MM/DD'),
-					];
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
 
-					let manageName = info.manager.split(",");
-					let manageValue = info.managerId.split(",");
-					let optionsManage = []
-					for (let i = 0; i < manageName.length; i++) {
-						let obj = {
-							label: manageName[i],
-							value: manageValue[i]
-						}
-						optionsManage.push(obj)
-					}
-					console.log(optionsManage)
-					state.classifySelect1 = optionsManage;
-					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
-					remark.value = info.remark;
-					state.checked = info.boeFlag ? info.boeFlag : false;
-					state.classifySelect3 = classifyList3.value[info.level];
-					state.classifySelect4 = classifyList4.value[info.systemId - 1];
-					state.checked1 = info.boeFlag ? info.boeFlag : false;
-					// fileList1.value = info.attach.split(",");
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
 
-					projectType = 1;
-					picUrl = info.picUrl;
-					beginTime = Number(info.beginTime / 1000);
-					endTime = Number(info.endTime / 1000);
-					manager = info.manager;
-					managerId = info.managerId;
-					sourceBelongIdC = Number(info.sourceBelongId);
-					courseSyncFlag = info.courseSyncFlag;
-					levels = info.level;
-					systemid = info.systemId;
-					boeFlag = info.boeFlag;
-					paraentID = Number(info.parentId);
-				}
-			}).catch(err => { console.log(err) })
-		} else {
-			paraentID = Number(routers.query.projectId);
-		}
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+            paraentID = Number(info.parentId);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    } else {
+      paraentID = Number(routers.query.projectId);
+    }
 
+    const backPage = () => {
+      setTimeout(() => {
+        router.push({
+          path: "/manage/projectmanage",
+        });
+      }, 400);
+    };
 
-		const backPage = () => {
-			setTimeout(() => {
-				router.push({
-					path: "/projectmanage"
-				});
-			}, 400);
-		}
+    const projectName = ref("");
 
+    const classifyList = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
 
+    let projectType = "";
 
-		const projectName = ref("");
+    const classificationChange = (value) => {
+      console.log(`selected ${value}`);
+      projectType = value;
+    };
 
-		const classifyList = ref([
-			{ value: 1, label: "管理者" },
-			{ value: 2, label: "领军者" },
-			{ value: 3, label: "产业人" },
-		]);
+    function getBase64(img, callback) {
+      const reader = new FileReader();
+      reader.addEventListener("load", () => callback(reader.result));
+      reader.readAsDataURL(img);
+    }
 
-		let projectType = "";
+    const fileList = ref([]);
+    const fileList1 = ref([]);
+    const loading = ref(false);
+    const imageUrl = ref("");
+    let picUrl = "";
 
-		const classificationChange = (value) => {
-			console.log(`selected ${value}`);
-			projectType = value;
-		};
+    const handleChange = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log("上传图片返回的信息 %o", info);
+        picUrl = info.file.response.data;
+        // Get this url from response in real world.
+        getBase64(info.file.originFileObj, (base64Url) => {
+          imageUrl.value = base64Url;
+          loading.value = false;
+        });
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		function getBase64(img, callback) {
-			const reader = new FileReader();
-			reader.addEventListener("load", () => callback(reader.result));
-			reader.readAsDataURL(img);
-		}
+    let uplodaFileCount = false;
 
-		const fileList = ref([]);
-		const fileList1 = ref([]);
-		const loading = ref(false);
-		const imageUrl = ref("");
-		let picUrl = "";
+    let attach = "";
+    let attachData = "";
+    const handleChange1 = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log(
+          "上传附件返回的信息 %o",
+          info,
+          info.fileList.length,
+          uplodaFileCount
+        );
 
-		const handleChange = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log("上传图片返回的信息 %o", info);
-				picUrl = info.file.response.data;
-				// Get this url from response in real world.
-				getBase64(info.file.originFileObj, (base64Url) => {
-					imageUrl.value = base64Url;
-					loading.value = false;
-				});
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+        let attachStr = "";
+        attachData = info.fileList;
+        for (let i = 0; i < attachData.length; i++) {
+          if (attachData.length - 1 == i) {
+            attachStr += attachData[i].response.data;
+          } else {
+            attachStr += attachData[i].response.data + ",";
+          }
+        }
+        console.log(attachStr);
+        attach = attachStr;
 
-		let uplodaFileCount = false;
+        if (info.fileList.length > 5) {
+          uplodaFileCount = true;
+        } else {
+          uplodaFileCount = false;
+        }
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		let attach = "";
-		let attachData = "";
-		const handleChange1 = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log(
-					"上传附件返回的信息 %o",
-					info,
-					info.fileList.length,
-					uplodaFileCount
-				);
+    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;
+    };
 
-				let attachStr = "";
-				attachData = info.fileList;
-				for (let i = 0; i < attachData.length; i++) {
-					if (attachData.length - 1 == i) {
-						attachStr += attachData[i].response.data;
-					} else {
-						attachStr += attachData[i].response.data + ",";
-					}
-				}
-				console.log(attachStr);
-				attach = attachStr;
+    const beforeUpload1 = () => {
+      return new Promise((resovle, reject) => {
+        if (uplodaFileCount) {
+          message.info("上传文件数量已达最大数量");
+          return reject(false);
+        }
+        return resovle(true);
+      });
+    };
 
-				if (info.fileList.length > 5) {
-					uplodaFileCount = true;
-				} else {
-					uplodaFileCount = false;
-				}
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+    let beginTime = "";
+    let endTime = "";
+    const dateFormatList = ["YYYY/MM/DD"];
 
-		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 onRangeChange = (value, dateString) => {
+      console.log("Selected Time: ", value);
+      // 项目时间选择函数
+      console.log("Formatted Selected Time: ", dateString);
+      console.log(
+        "Formatted Selected TimeStamp",
+        new Date(dateString[0]).getTime()
+      );
+      beginTime = new Date(dateString[0]).getTime() / 1000;
+      endTime = new Date(dateString[1]).getTime() / 1000;
+    };
 
-		const beforeUpload1 = () => {
-			return new Promise((resovle, reject) => {
-				if (uplodaFileCount) {
-					message.info("上传文件数量已达最大数量");
-					return reject(false);
-				}
-				return resovle(true);
-			});
-		};
+    // 项目经理 后续接口调用
+    const classifyList1 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
 
-		let beginTime = "";
-		let endTime = "";
-		const dateFormatList = ['YYYY/MM/DD'];
+    let manager = "";
+    let managerId = "";
+    const classificationChange1 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      state.classifySelect1 = options;
+      let newoptions = [];
+      for (let i = 0; i < state.classifySelect1.length; i++) {
+        if (state.classifySelect1[i].value) {
+          newoptions.push(state.classifySelect1[i]);
+        }
+      }
+      state.classifySelect1 = newoptions;
+      manager = mstr;
+      managerId = midstr;
+    };
 
-		const onRangeChange = (value, dateString) => {
-			console.log("Selected Time: ", value);
-			// 项目时间选择函数
-			console.log("Formatted Selected Time: ", dateString);
-			console.log(
-				"Formatted Selected TimeStamp",
-				new Date(dateString[0]).getTime()
-			);
-			beginTime = new Date(dateString[0]).getTime() / 1000;
-			endTime = new Date(dateString[1]).getTime() / 1000;
-		};
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList2 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
 
-		// 项目经理 后续接口调用
-		const classifyList1 = ref([
-			{ value: 1, label: "李俊国" },
-			{ value: 2, label: "将小米" },
-			{ value: 3, label: "刘孟君" },
-		]);
+    let sourceBelongIdC = "";
+    const classificationChange2 = (key) => {
+      console.log(`selected ${key}`, classifyList2);
+      sourceBelongIdC = key;
+    };
 
-		let manager = "";
-		let managerId = "";
-		const classificationChange1 = (key, options) => {
-			console.log(`selected ${key}`, options);
-			let mstr = "";
-			let midstr = "";
-			for (let i = 0; i < key.length; i++) {
-				if (key.length - 1 !== i) {
-					midstr += key[i] + ",";
-					mstr += classifyList1.value[i].label + ",";
-				} else {
-					midstr += key[i];
-					mstr += classifyList1.value[i].label;
-				}
-			}
-			console.log(mstr, midstr);
-			state.classifySelect1 = options;
-			let newoptions = [];
-			for (let i = 0; i < state.classifySelect1.length; i++) {
-				if (state.classifySelect1[i].value) {
-					newoptions.push(state.classifySelect1[i])
-				}
-			}
-			state.classifySelect1 = newoptions;
-			manager = mstr;
-			managerId = midstr;
-		};
+    // 项目级别
+    const classifyList3 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 资源归属 sourceBelongId 后续给接口
-		const classifyList2 = ref([
-			{ value: 1, label: "项目一" },
-			{ value: 2, label: "项目二" },
-			{ value: 3, label: "项目三" },
-		]);
+    let levels = "";
+    const classificationChange3 = (key) => {
+      console.log(`selected ${key}`, classifyList3);
+      levels = key;
+    };
 
-		let sourceBelongIdC = '';
-		const classificationChange2 = (key) => {
-			console.log(`selected ${key}`, classifyList2);
-			sourceBelongIdC = key;
-		};
+    // 培训分类
+    const classifyList4 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 项目级别
-		const classifyList3 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let systemid = "";
+    const classificationChange4 = (key) => {
+      console.log(`selected ${key}`, classifyList4);
+      systemid = key;
+    };
 
-		let levels = "";
-		const classificationChange3 = (key) => {
-			console.log(`selected ${key}`, classifyList3);
-			levels = key;
-		};
+    // 模版
+    const classifyList5 = ref([
+      { value: 1, label: "模版一" },
+      { value: 2, label: "模版二" },
+      { value: 3, label: "模版三" },
+      { value: 4, label: "模版四" },
+    ]);
+    const classificationChange5 = (key) => {
+      console.log(`selected ${key}`, classifyList5);
+    };
 
-		// 培训分类
-		const classifyList4 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    // 项目说明
+    const remark = ref("");
 
-		let systemid = "";
-		const classificationChange4 = (key) => {
-			console.log(`selected ${key}`, classifyList4);
-			systemid = key;
-		};
+    let courseSyncFlag = 0;
+    const changeChecked = () => {
+      console.log(state.checked);
+      state.checked ? (state.checked = false) : (state.checked = true);
+      courseSyncFlag = state.checked ? 1 : 0;
+    };
 
-		// 模版
-		const classifyList5 = ref([
-			{ value: 1, label: "模版一" },
-			{ value: 2, label: "模版二" },
-			{ value: 3, label: "模版三" },
-			{ value: 4, label: "模版四" },
-		]);
-		const classificationChange5 = (key) => {
-			console.log(`selected ${key}`, classifyList5);
-		};
+    let boeFlag = 0;
+    const changeChecked1 = () => {
+      console.log(state.checked1);
+      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+      boeFlag = state.checked1 ? 1 : 0;
+    };
 
-		// 项目说明
-		const remark = ref("");
+    const removeFile = (file) => {
+      const index = fileList1.value.indexOf(file);
+      const newFileList = fileList1.value.slice();
+      newFileList.splice(index, 1);
+      fileList1.value = newFileList;
 
-		let courseSyncFlag = 0;
-		const changeChecked = () => {
-			console.log(state.checked);
-			state.checked ? (state.checked = false) : (state.checked = true);
-			courseSyncFlag = state.checked ? 1 : 0;
-		};
+      let attachStr = "";
+      if (newFileList.length == 0) {
+        attachStr = "";
+      }
+      for (let i = 0; i < fileList1["value"].length; i++) {
+        console.log(fileList1["value"][i].response.data);
+        if (fileList1["value"].length - 1 == i) {
+          attachStr += fileList1["value"][i].response.data;
+        } else {
+          attachStr += fileList1["value"][i].response.data + ",";
+        }
+      }
+      attach = attachStr;
+    };
 
-		let boeFlag = 0;
-		const changeChecked1 = () => {
-			console.log(state.checked1);
-			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-			boeFlag = state.checked1 ? 1 : 0;
-		};
+    const errorMsgs = {
+      name: "请输入项目名称",
+      category: "请选择项目分类",
+      picUrl: "请上传项目封面图",
+      beginTime: "请选择项目开始时间",
+      endTime: "请选择项目结束时间",
+      manager: "请选择项目经理",
+      managerId: "请选择项目经理",
+      sourceBelongId: "请选择资源归属",
+      level: "请填写项目级别",
+      systemId: "请填写项目培训分类",
+      boeFlag: "请选择是否BOE实施",
+    };
 
-		const removeFile = (file) => {
-			const index = fileList1.value.indexOf(file);
-			const newFileList = fileList1.value.slice();
-			newFileList.splice(index, 1);
-			fileList1.value = newFileList;
+    const createProject = () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      if (isEdit.value) {
+        console.log("我要编辑项目", peojectID);
+        let obj = {
+          projectId: Number(peojectID),
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 0,
+          parentId: paraentID,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
 
-			let attachStr = "";
-			if (newFileList.length == 0) {
-				attachStr = "";
-			}
-			for (let i = 0; i < fileList1["value"].length; i++) {
-				console.log(fileList1["value"][i].response.data);
-				if (fileList1["value"].length - 1 == i) {
-					attachStr += fileList1["value"][i].response.data;
-				} else {
-					attachStr += fileList1["value"][i].response.data + ",";
-				}
-			}
-			attach = attachStr;
-		};
+        console.log(obj);
 
-		const errorMsgs = {
-			name: "请输入项目名称",
-			category: "请选择项目分类",
-			picUrl: "请上传项目封面图",
-			beginTime: "请选择项目开始时间",
-			endTime: "请选择项目结束时间",
-			manager: "请选择项目经理",
-			managerId: "请选择项目经理",
-			sourceBelongId: "请选择资源归属",
-			level: "请填写项目级别",
-			systemId: "请填写项目培训分类",
-			boeFlag: "请选择是否BOE实施"
-		};
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
 
-		const createProject = () => {
-			console.log('我是否要编辑项目', isEdit.value)
-			if (isEdit.value) {
-				console.log('我要编辑项目', peojectID)
-				let obj = {
-					projectId: Number(peojectID),
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 0,
-					parentId: paraentID,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("编辑成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/manage/projectmanage",
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("编辑失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("编辑失败，请检查当前网络状态。");
+          });
+      } else {
+        let obj = {
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 10,
+          parentId: paraentID,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
+        console.log("提交的数据格式 %o", obj);
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
 
-				console.log(obj);
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("创建成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/manage/taskpage",
+                  query: { id: res.data.data.projectId },
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("创建失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("创建失败，请检查当前网络状态。");
+          });
+      }
+    };
 
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+    return {
+      ...toRefs(state),
+      projectName,
+      classifyList,
+      classificationChange,
+      classificationChange1,
+      classificationChange2,
+      classificationChange3,
+      classificationChange4,
+      classificationChange5,
+      fileList,
+      fileList1,
+      loading,
+      imageUrl,
+      handleChange,
+      handleChange1,
+      beforeUpload,
+      beforeUpload1,
+      onRangeChange,
+      classifyList1,
+      classifyList2,
+      classifyList3,
+      classifyList4,
+      classifyList5,
+      remark,
+      changeChecked,
+      changeChecked1,
+      uplodaFileCount,
+      createProject,
+      removeFile,
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("编辑成功");
-							setTimeout(() => {
-								router.push({
-									path: "/projectmanage"
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("编辑失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("编辑失败，请检查当前网络状态。");
-					});
-
-			} else {
-				let obj = {
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 10,
-					parentId: paraentID,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
-				console.log("提交的数据格式 %o", obj);
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
-
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("创建成功");
-							setTimeout(() => {
-								router.push({
-									path: "/taskpage",
-									query: { id: res.data.data.projectId },
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("创建失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("创建失败，请检查当前网络状态。");
-					});
-			}
-		};
-
-		return {
-			...toRefs(state),
-			projectName,
-			classifyList,
-			classificationChange,
-			classificationChange1,
-			classificationChange2,
-			classificationChange3,
-			classificationChange4,
-			classificationChange5,
-			fileList,
-			fileList1,
-			loading,
-			imageUrl,
-			handleChange,
-			handleChange1,
-			beforeUpload,
-			beforeUpload1,
-			onRangeChange,
-			classifyList1,
-			classifyList2,
-			classifyList3,
-			classifyList4,
-			classifyList5,
-			remark,
-			changeChecked,
-			changeChecked1,
-			uplodaFileCount,
-			createProject,
-			removeFile,
-
-			isEdit,
-			backPage,
-			dateFormatList,
-		};
-	},
+      isEdit,
+      backPage,
+      dateFormatList,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .sonproject {
-	width: 100%;
-	// height: inherit;
-	// flex: 1;
-	// flex-shrink: 0;
-	// overflow-y: auto;
+  width: 100%;
+  // height: inherit;
+  // flex: 1;
+  // flex-shrink: 0;
+  // overflow-y: auto;
 
-	.header {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
+  .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;
-		}
+    .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;
+    .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");
-			}
+      .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;
-			}
-		}
-	}
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
 
-	// 修改 antd upload 样式
-	.ant-upload {
-		border-width: 0px;
-	}
+  // 修改 antd upload 样式
+  .ant-upload {
+    border-width: 0px;
+  }
 
-	.content {
-		display: flex;
+  .content {
+    display: flex;
 
-		.main {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: left;
-			border-right: 1px solid rgba(153, 155, 163, 0.3);
+    .main {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: left;
+      border-right: 1px solid rgba(153, 155, 163, 0.3);
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
+      .name {
+        width: 78%;
+        // 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;
+        //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;
-					}
-				}
+          .nameimg {
+            width: 10px;
+            height: 10px;
+          }
+        }
 
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.box {
-					position: relative;
-					margin-left: 14px;
+        .box {
+          position: relative;
+          margin-left: 14px;
 
-					.box1 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						width: 50px;
-						margin-left: -25px;
-						margin-top: -5px;
-						border-top: 2px solid rgba(78, 166, 255, 1);
-					}
+          .box1 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            margin-left: -25px;
+            margin-top: -5px;
+            border-top: 2px solid rgba(78, 166, 255, 1);
+          }
 
-					.box2 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						height: 50px;
-						//margin-left: -5px;
-						margin-top: -25px;
-						border-left: 2px solid rgba(78, 166, 255, 1);
-					}
-				}
+          .box2 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 50px;
+            //margin-left: -5px;
+            margin-top: -25px;
+            border-left: 2px solid rgba(78, 166, 255, 1);
+          }
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+        }
 
-				.in {
-					margin-left: 14px;
-					flex: 1;
+        .in {
+          margin-left: 14px;
+          flex: 1;
 
-					// .ant-radio-wrapper {
-					// }
-					.ant-input-textarea-show-count {
-						position: relative;
-						height: 88px;
-					}
+          // .ant-radio-wrapper {
+          // }
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
 
-					.ant-input-textarea-show-count::after {
-						position: absolute;
-						right: 10px;
-						bottom: 0px;
-					}
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 0px;
+          }
 
-					.ant-input {
-						border-radius: 8px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 8px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-input-affix-wrapper {
-						padding: 0 11px;
-						border-radius: 8px;
-					}
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
 
-				.filebox {
-					margin-left: 14px;
-					flex: 1;
+        .filebox {
+          margin-left: 14px;
+          flex: 1;
 
-					.fileimg {
-						width: 15px;
-						height: 15px;
-						margin-right: 6px;
-					}
+          .fileimg {
+            width: 15px;
+            height: 15px;
+            margin-right: 6px;
+          }
 
-					.filetext {
-						font-size: 14px;
-						font-weight: 400;
-						color: #4ea6ff;
-						line-height: 36px;
-					}
+          .filetext {
+            font-size: 14px;
+            font-weight: 400;
+            color: #4ea6ff;
+            line-height: 36px;
+          }
 
-					.support {
-						font-size: 14px;
-						font-weight: 400;
-						color: #999ba3;
-						line-height: 36px;
-						margin-top: 8px;
-						word-break: break-all;
-					}
-				}
-			}
+          .support {
+            font-size: 14px;
+            font-weight: 400;
+            color: #999ba3;
+            line-height: 36px;
+            margin-top: 8px;
+            word-break: break-all;
+          }
+        }
+      }
 
-			.name2 {
-				display: flex;
-				align-items: flex-start;
+      .name2 {
+        display: flex;
+        align-items: flex-start;
 
-				.ant-input-textarea {
-					.ant-input {
-						height: 88px;
-					}
-				}
-			}
-		}
+        .ant-input-textarea {
+          .ant-input {
+            height: 88px;
+          }
+        }
+      }
+    }
 
-		.template {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: right;
+    .template {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: right;
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
-				height: 40px;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        height: 40px;
 
-				// border: 1px solid black;
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        // border: 1px solid black;
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-					width: 65px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+          width: 65px;
+        }
 
-				.in {
-					margin-left: 14px;
-					width: 81%;
+        .in {
+          margin-left: 14px;
+          width: 81%;
 
-					.ant-input {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
-			}
-		}
-	}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
+      }
+    }
+  }
 
-	.footer {
-		width: 100%;
-		margin-top: 31px;
-		margin-bottom: 14px;
-		padding-bottom: 20px;
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    padding-bottom: 20px;
 
-		.btn {
-			display: flex;
-			justify-content: center;
+    .btn {
+      display: flex;
+      justify-content: center;
 
-			.btn1 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				background: #409eff;
-				color: #ffffff;
-				margin-right: 14px;
-			}
+      .btn1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        background: #409eff;
+        color: #ffffff;
+        margin-right: 14px;
+      }
 
-			.btn2 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				border: 1px solid #409eff;
-				background: #ffffff;
-				color: #409eff;
-			}
-		}
+      .btn2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        border: 1px solid #409eff;
+        background: #ffffff;
+        color: #409eff;
+      }
+    }
 
-		.text {
-			color: rgba(153, 155, 163, 1);
-			font-size: 14px;
-			margin-left: 223px;
-		}
-	}
+    .text {
+      color: rgba(153, 155, 163, 1);
+      font-size: 14px;
+      margin-left: 223px;
+    }
+  }
 }
 </style>
 
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 29c15a0a..6902fb23 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -149,7 +149,7 @@
               <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
             <div class="pub">保存</div>
             <div class="line"></div> -->
-              <router-link to="/taskpage">
+              <router-link to="/manage/taskpage">
                 <div style="display: flex">
                   <img
                     class="img2"
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f6fada13..a075b234 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -86,7 +86,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/projectmanage">
+        <router-link to="/manage/projectmanage">
           <div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -321,8 +321,8 @@
               <button class="btn" @click="showFaceIn" v-if="morFaceT">
                 批量面授报名
               </button>
-              <router-link to="/taskadd">
-                <button to="/taskadd" class="edit">
+              <router-link to="/manage/taskadd">
+                <button to="/manage/taskadd" class="edit">
                   <img
                     class="editimg"
                     src="../../assets/images/projectadd/edit.png"
@@ -505,7 +505,7 @@
               </a-collapse>
               <!-- 无数据创建任务  v-if="taskSyllabus.length == 0"-->
               <router-link
-                to="/taskadd"
+                to="/manage/taskadd"
                 class="taskbox"
                 style="
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
@@ -3349,7 +3349,7 @@ export default {
     const toEdit = () => {
       if (state.parentId == "0") {
         routered.push({
-          path: "/projectadd",
+          path: "/manage/projectadd",
           query: {
             projectId: state.projectId,
             name: state.name,
@@ -3358,7 +3358,7 @@ export default {
       } else {
         if (state.isbj !== null) {
           routered.push({
-            path: "/classadd",
+            path: "/manage/classadd",
             query: {
               projectId: state.projectId,
               // name: state.paraentName,
@@ -3368,7 +3368,7 @@ export default {
           });
         } else {
           routered.push({
-            path: "/sonproject",
+            path: "/manage/sonproject",
             query: {
               projectId: state.projectId,
               name: state.name,
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index f450dadc..a809d8ee 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -24,10 +24,10 @@
                 type="date"
                 placeholder="创建时间"
                 style="
-                width: 270px;
-                height: 40px; 
-                border-radius: 8px;
-                margin-right: 14px;
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
                 "
               />
             </div>
@@ -62,7 +62,7 @@
 <script>
 import { reactive, defineComponent, toRefs, onMounted } from "vue";
 import { message } from "ant-design-vue";
-import * as api from "@/api/indexLibrary"
+import * as api from "@/api/indexLibrary";
 const columns1 = [
   {
     title: "模版名称",
@@ -106,7 +106,7 @@ export default defineComponent({
   name: "TemplateLibrary",
   setup() {
     const state = reactive({
-      value1:null,
+      value1: null,
       tableData1: [
         {
           key: "1",
@@ -123,7 +123,7 @@ export default defineComponent({
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
-        }
+        },
       ],
       // state
     });
@@ -138,7 +138,7 @@ export default defineComponent({
                 {value.status === "已发布" ? (
                   <div class="nselect">
                     <div class="ops2">
-                      <router-link to="/libraryadd">
+                      <router-link to="/manage/libraryadd">
                         <div class="jc">
                           查看{" "}
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
@@ -146,9 +146,17 @@ export default defineComponent({
                       </router-link>
                     </div>
                     <div class="ops3">
-                      <div class="jc"
-                      onClick={() => {templateHadler({"projectTemplateId": value.projectTemplateId,"type": 0})}}
-                      >撤回</div>
+                      <div
+                        class="jc"
+                        onClick={() => {
+                          templateHadler({
+                            projectTemplateId: value.projectTemplateId,
+                            type: 0,
+                          });
+                        }}
+                      >
+                        撤回
+                      </div>
                     </div>
                   </div>
                 ) : (
@@ -157,14 +165,21 @@ export default defineComponent({
                 {value.status === "未发布" ? (
                   <div class="nselect">
                     <div class="ops1">
-                      <div class="jc"
-                       onClick={() => {templateHadler({"projectTemplateId": value.projectTemplateId,"type": 1})}}>
+                      <div
+                        class="jc"
+                        onClick={() => {
+                          templateHadler({
+                            projectTemplateId: value.projectTemplateId,
+                            type: 1,
+                          });
+                        }}
+                      >
                         发布
                         <span style="color:#E9E9E9;margin-left:15px;">|</span>
                       </div>
                     </div>
                     <div class="ops2">
-                      <router-link to="/libraryadd">
+                      <router-link to="/manage/libraryadd">
                         <div class="jc">
                           查看
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
@@ -172,9 +187,17 @@ export default defineComponent({
                       </router-link>
                     </div>
                     <div class="ops3">
-                      <div class="jc"
-                      onClick={() => {templateHadler({"projectTemplateId": value.projectTemplateId,"type": -1})}}
-                      >删除</div>
+                      <div
+                        class="jc"
+                        onClick={() => {
+                          templateHadler({
+                            projectTemplateId: value.projectTemplateId,
+                            type: -1,
+                          });
+                        }}
+                      >
+                        删除
+                      </div>
                     </div>
                   </div>
                 ) : (
@@ -191,54 +214,63 @@ export default defineComponent({
 
     onMounted(() => {
       getLibraryList();
-    })
+    });
     const getLibraryList = () => {
       let obj = {
-        "beginTime": 0,
-        "endTime": 0,
-        "name": "",
-        "pageNo": 0,
-        "pageSize": 0,
-        "status": 0
-      }
-      api.templateList(obj).then((res) =>{
-        console.log(res);
-        let resData = res.data.data.rows
-        if(resData.length) {
-          for(let i in resData) { 
-            state.tableData1[i].id = i+1;
-            state.tableData1[i].projectTemplateId = resData[i].projectTemplateId;
-            state.tableData1[i].status = resData[i].status ? "已发布":"未发布" ;
-            state.tableData1[i].name = resData[i].name;
-            state.tableData1[i].creator = resData[i].createName;
-            state.tableData1[i].stutime = resData[i].publishTime;
-            state.tableData1[i].operation = "operation";
-            
+        beginTime: 0,
+        endTime: 0,
+        name: "",
+        pageNo: 0,
+        pageSize: 0,
+        status: 0,
+      };
+      api
+        .templateList(obj)
+        .then((res) => {
+          console.log(res);
+          let resData = res.data.data.rows;
+          if (resData.length) {
+            for (let i in resData) {
+              state.tableData1[i].id = i + 1;
+              state.tableData1[i].projectTemplateId =
+                resData[i].projectTemplateId;
+              state.tableData1[i].status = resData[i].status
+                ? "已发布"
+                : "未发布";
+              state.tableData1[i].name = resData[i].name;
+              state.tableData1[i].creator = resData[i].createName;
+              state.tableData1[i].stutime = resData[i].publishTime;
+              state.tableData1[i].operation = "operation";
+            }
+          } else {
+            message.warning("获取的列表数据为空值");
           }
-          
-        } else {
-          message.warning("获取的列表数据为空值")
-        }
-      }).catch((error) => {
-        message.error(`获取模板列表失败`+error)
-      });
+        })
+        .catch((error) => {
+          message.error(`获取模板列表失败` + error);
+        });
     };
     const templateHadler = (obj) => {
-      api.templateHadle(obj).then((res) => {
-        if(res.data.success) {
-          message.success(`模板操作成功`)
-          getLibraryList();
-        }
-      }).catch((error) => {
-        message.error(`模板操作失败`+error)
-      })
-    }
+      api
+        .templateHadle(obj)
+        .then((res) => {
+          if (res.data.success) {
+            message.success(`模板操作成功`);
+            getLibraryList();
+          }
+        })
+        .catch((error) => {
+          message.error(`模板操作失败` + error);
+        });
+    };
     const searchLevel = () => {
-      const result = state.tableData1.filter(item => item.name == state.value1)
+      const result = state.tableData1.filter(
+        (item) => item.name == state.value1
+      );
       state.tableData1 = result;
     };
     const resetLevel = () => {
-      state.value1 = '';
+      state.value1 = "";
       // getLibraryList();
       state.tableData1 = [
         {
@@ -256,8 +288,8 @@ export default defineComponent({
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
-        }
-      ]
+        },
+      ];
     };
 
     return {
@@ -367,7 +399,7 @@ export default defineComponent({
       }
     }
     .tmpl_body {
-      padding:0px 30px;
+      padding: 0px 30px;
       .tmpl_tabbox {
         .operation {
           display: flex;
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index a5cc20ae..a7201aea 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -1,294 +1,294 @@
 <!---- 创建模板页面 --->
 <template>
-    <div class="projectAdd">
-      <div class="header">
-        <span class="title">创建/编辑单层模板</span>
-        <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/libraryAdd"
-          class="goback"
-        >
-          <span class="return"></span><span class="returntext">返回</span>
-        </div>
+  <div class="projectAdd">
+    <div class="header">
+      <span class="title">创建/编辑单层模板</span>
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/manage/libraryAdd"
+        class="goback"
+      >
+        <span class="return"></span><span class="returntext">返回</span>
       </div>
-      <div class="content">
-        <div class="main">
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">模板名称</div>
-            </div>
-            <div class="in">
-              <a-input
-                v-model:value="projectName"
-                placeholder="请输入模板名称"
-                show-count
-                :maxlength="30"
-                :disabled="viewDetail ? true : false"
-              />
-            </div>
+    </div>
+    <div class="content">
+      <div class="main">
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">模板名称</div>
           </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">分类</div>
-            </div>
-            <div class="in select">
-              <a-select
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
-                "
-                v-model:value="classifySelect"
-                placeholder="四个养成"
-                style="width: 100%"
-                :options="classifyList"
-                @change="classificationChange"
-                allowClear
-                showSearch
-                :disabled="viewDetail ? true : false"
-              >
-              </a-select>
-            </div>
+          <div class="in">
+            <a-input
+              v-model:value="projectName"
+              placeholder="请输入模板名称"
+              show-count
+              :maxlength="30"
+              :disabled="viewDetail ? true : false"
+            />
           </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">封面图</div>
-            </div>
-            <div
-              class="box"
-              style="
-                width: 100px;
-                height: 100px;
-                border: 1px solid rgba(78, 166, 255, 1);
-                border-radius: 5px;
-                cursor: pointer;
-                position: relative;
-                overflow: hidden;
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">分类</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
               "
+              v-model:value="classifySelect"
+              placeholder="四个养成"
+              style="width: 100%"
+              :options="classifyList"
+              @change="classificationChange"
+              allowClear
+              showSearch
+              :disabled="viewDetail ? true : false"
             >
-              <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"
-                :disabled="viewDetail ? true : false"
-              >
-                <img
-                  style="
-                    width: 100px;
-                    height: 100px;
-                    margin-bottom: 4px;
-                    margin-right: 4px;
-                  "
-                  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="box1"></div>
-                  <div class="box2"></div>
-                  <!-- <div class="ant-upload-text"></div> -->
-                </div>
-              </a-upload>
-            </div>
+            </a-select>
           </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">项目时间</div>
-            </div>
-  
-            <div class="in">
-              <a-range-picker
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="rangevalue"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                @change="onRangeChange"
-                :disabled="viewDetail ? true : false"
-              />
-            </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">封面图</div>
           </div>
-          <div class="name">
-            <div class="namebox">
+          <div
+            class="box"
+            style="
+              width: 100px;
+              height: 100px;
+              border: 1px solid rgba(78, 166, 255, 1);
+              border-radius: 5px;
+              cursor: pointer;
+              position: relative;
+              overflow: hidden;
+            "
+          >
+            <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"
+              :disabled="viewDetail ? true : false"
+            >
               <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">项目经理</div>
-            </div>
-            <div class="in">
-              <a-select
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
+                style="
+                  width: 100px;
+                  height: 100px;
+                  margin-bottom: 4px;
+                  margin-right: 4px;
                 "
-                :value="classifySelect1"
-                mode="multiple"
-                placeholder="请选择项目经理"
-                style="width: 100%"
-                :options="classifyList1"
-                @change="classificationChange1"
-                allowClear
-                showSearch
-                :disabled="viewDetail ? true : false"
-              >
-              </a-select>
-            </div>
-          </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+                v-if="imageUrl"
+                :src="imageUrl"
+                alt="avatar"
               />
-              <div class="inname">资源归属</div>
-            </div>
-  
-            <div class="in select">
-              <a-select
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
+              <div v-else>
+                <!-- <loading-outlined v-if="loading"></loading-outlined> -->
+                <!-- <plus-outlined v-else></plus-outlined> -->
+                <div class="box1"></div>
+                <div class="box2"></div>
+                <!-- <div class="ant-upload-text"></div> -->
+              </div>
+            </a-upload>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目时间</div>
+          </div>
+
+          <div class="in">
+            <a-range-picker
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="rangevalue"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              @change="onRangeChange"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目经理</div>
+          </div>
+          <div class="in">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              :value="classifySelect1"
+              mode="multiple"
+              placeholder="请选择项目经理"
+              style="width: 100%"
+              :options="classifyList1"
+              @change="classificationChange1"
+              allowClear
+              showSearch
+              :disabled="viewDetail ? true : false"
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">资源归属</div>
+          </div>
+
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              placeholder="自动带出 可修改"
+              :options="classifyList2"
+              @change="classificationChange2"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">模板说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-radio
+              @click="changeChecked"
+              v-model:checked="checked"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
                 "
-                v-model:value="classifySelect2"
-                placeholder="自动带出 可修改"
-                :options="classifyList2"
-                @change="classificationChange2"
-                :disabled="viewDetail ? true : false"
-              />
-            </div>
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-radio
+            >
           </div>
-          <div class="name name2">
-            <div class="namebox">
-              <div class="inname" style="margin-top: 13px">模板说明</div>
-            </div>
-            <div class="in">
-              <a-textarea
-                v-model:value="remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
-                :disabled="viewDetail ? true : false"
-              />
-            </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
           </div>
-          <div class="name name2">
-            <div class="namebox">
-              <div class="inname">同步学习记录</div>
-            </div>
-            <div class="in">
-              <a-radio
-                @click="changeChecked"
-                v-model:checked="checked"
-                :disabled="viewDetail ? true : false"
-                ><span
-                  style="
-                    width: 100%;
-                    color: rgba(109, 117, 132, 1);
-                    font-size: 14px;
-                  "
-                  >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                ></a-radio
-              >
-            </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect3"
+              :options="classifyList3"
+              @change="classificationChange3"
+              placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
+            />
           </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">项目级别</div>
-            </div>
-            <div class="in select">
-              <a-select
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训体系</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect4"
+              :options="classifyList4"
+              @change="classificationChange4"
+              placeholder="集团级/组织级/现地级/部门级"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio
+              @click="changeChecked1"
+              v-model:checked="checked1"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
                 "
-                v-model:value="classifySelect3"
-                :options="classifyList3"
-                @change="classificationChange3"
-                placeholder="集团级/组织级/现地级/部门级"
-                :disabled="viewDetail ? true : false"
-              />
-            </div>
+                >BOEU实施</span
+              ></a-radio
+            >
           </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">培训体系</div>
-            </div>
-            <div class="in select">
-              <a-select
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
-                "
-                v-model:value="classifySelect4"
-                :options="classifyList4"
-                @change="classificationChange4"
-                placeholder="集团级/组织级/现地级/部门级"
-                :disabled="viewDetail ? true : false"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="namebox">
-              <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-              <div class="inname">是否BOEU实施</div>
-            </div>
-            <div class="in">
-              <a-radio
-                @click="changeChecked1"
-                v-model:checked="checked1"
-                :disabled="viewDetail ? true : false"
-                ><span
-                  style="
-                    width: 100%;
-                    color: rgba(109, 117, 132, 1);
-                    font-size: 14px;
-                  "
-                  >BOEU实施</span
-                ></a-radio
-              >
-            </div>
-          </div>
-          <!-- <div class="name name2">
+        </div>
+        <!-- <div class="name name2">
                       <div class="namebox" style="margin-top: 8px">
                           <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
                           <div class="inname">附件</div>
@@ -307,98 +307,157 @@
                           </div>
                       </div>
                   </div> -->
-        </div>
-        <!--  选择模板 ------------------------------ -->
-        <div class="template" style="display: none">
-          <div class="name">
-            <div class="inname" style="width: 50px">模版</div>
-            <div class="in select" style="margin-left: 2px">
-              <a-select
-                v-if="isEdit"
-                disabled="true"
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
-                "
-                v-model:value="classifySelect5"
-                placeholder="请选择模版"
-                :size="size"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-              >
-              </a-select>
-              <a-select
-                v-else
-                :getPopupContainer="
-                  (triggerNode) => {
-                    return triggerNode.parentNode || document.body;
-                  }
-                "
-                v-model:value="classifySelect5"
-                placeholder="请选择模版"
-                :size="size"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-                @popupScroll="templateScroll"
-              >
-              </a-select>
-            </div>
+      </div>
+      <!--  选择模板 ------------------------------ -->
+      <div class="template" style="display: none">
+        <div class="name">
+          <div class="inname" style="width: 50px">模版</div>
+          <div class="in select" style="margin-left: 2px">
+            <a-select
+              v-if="isEdit"
+              disabled="true"
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+            <a-select
+              v-else
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+            >
+            </a-select>
           </div>
         </div>
       </div>
-      <div class="footer">
-        <div class="btn">
-          <a-button v-on:click="createProject" type="primary" class="btn1"
-            >确定</a-button
-          >
-          <a-button @click="backPage" class="btn2">取消</a-button>
-        </div>
+    </div>
+    <div class="footer">
+      <div class="btn">
+        <a-button v-on:click="createProject" type="primary" class="btn1"
+          >确定</a-button
+        >
+        <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
     </div>
-  </template>
+  </div>
+</template>
   <script>
-  import { reactive, toRefs, ref } from "vue";
-  import { message } from "ant-design-vue";
-  import { useRouter, useRoute } from "vue-router";
-  import dayjs from "dayjs";
-  import * as api from "../../api/index";
-  import { storage } from "../../api/storage";
-  import { toDate } from "../../api/method";
-  
-  export default {
-    name: "projectAdd",
-    setup() {
-      // 编辑页面跳转过来时候，自动填充表格
-      const routers = useRoute();
-      const isEdit = ref(false);
-      let peojectID = "";
-  
-      if (routers.query.projectId) {
-        storage.set("projectAddId", routers.query.projectId);
+import { reactive, toRefs, ref } from "vue";
+import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
+import dayjs from "dayjs";
+import * as api from "../../api/index";
+import { storage } from "../../api/storage";
+import { toDate } from "../../api/method";
+
+export default {
+  name: "projectAdd",
+  setup() {
+    // 编辑页面跳转过来时候，自动填充表格
+    const routers = useRoute();
+    const isEdit = ref(false);
+    let peojectID = "";
+
+    if (routers.query.projectId) {
+      storage.set("projectAddId", routers.query.projectId);
+      isEdit.value = true;
+      peojectID = routers.query.projectId;
+      // 需要编辑
+      api
+        .getProjectDetail({ projectId: routers.query.projectId })
+        .then((res) => {
+          if (res.status == 200 && res.data.code == 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
+
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
+
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
+
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    } else {
+      if (storage.get("projectAddId")) {
         isEdit.value = true;
-        peojectID = routers.query.projectId;
+        peojectID = storage.get("projectAddId");
         // 需要编辑
         api
-          .getProjectDetail({ projectId: routers.query.projectId })
+          .getProjectDetail({ projectId: storage.get("projectAddId") })
           .then((res) => {
             if (res.status == 200 && res.data.code == 200) {
               let info = res.data.data.projectInfo;
-              console.log(info);
-              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+              console.log("我是从本地存储获取的id", info);
               projectName.value = info.name;
               state.classifySelect = classifyList.value[1]; // info.category
               imageUrl.value = info.picUrl;
-  
+
               let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
               let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
               state.rangevalue = [
                 dayjs(start, "YYYY/MM/DD"),
                 dayjs(end, "YYYY/MM/DD"),
               ];
-  
+
               let manageName = info.manager.split(",");
               let manageValue = info.managerId.split(",");
               let optionsManage = [];
@@ -418,8 +477,7 @@
               state.classifySelect3 = classifyList3.value[info.level];
               state.classifySelect4 = classifyList4.value[info.systemId - 1];
               state.checked1 = info.boeFlag ? info.boeFlag : false;
-              // fileList1.value = info.attach.split(",");
-  
+
               projectType = 1;
               picUrl = info.picUrl;
               beginTime = Number(info.beginTime / 1000);
@@ -436,924 +494,866 @@
           .catch((err) => {
             console.log(err);
           });
-      } else {
-        if (storage.get("projectAddId")) {
-          isEdit.value = true;
-          peojectID = storage.get("projectAddId");
-          // 需要编辑
-          api
-            .getProjectDetail({ projectId: storage.get("projectAddId") })
-            .then((res) => {
-              if (res.status == 200 && res.data.code == 200) {
-                let info = res.data.data.projectInfo;
-                console.log("我是从本地存储获取的id", info);
-                projectName.value = info.name;
-                state.classifySelect = classifyList.value[1]; // info.category
-                imageUrl.value = info.picUrl;
-  
-                let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-                let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-                state.rangevalue = [
-                  dayjs(start, "YYYY/MM/DD"),
-                  dayjs(end, "YYYY/MM/DD"),
-                ];
-  
-                let manageName = info.manager.split(",");
-                let manageValue = info.managerId.split(",");
-                let optionsManage = [];
-                for (let i = 0; i < manageName.length; i++) {
-                  let obj = {
-                    label: manageName[i],
-                    value: manageValue[i],
-                  };
-                  optionsManage.push(obj);
-                }
-                console.log(optionsManage);
-                state.classifySelect1 = optionsManage;
-                state.classifySelect2 =
-                  classifyList2.value[info.sourceBelongId - 1];
-                remark.value = info.remark;
-                state.checked = info.boeFlag ? info.boeFlag : false;
-                state.classifySelect3 = classifyList3.value[info.level];
-                state.classifySelect4 = classifyList4.value[info.systemId - 1];
-                state.checked1 = info.boeFlag ? info.boeFlag : false;
-  
-                projectType = 1;
-                picUrl = info.picUrl;
-                beginTime = Number(info.beginTime / 1000);
-                endTime = Number(info.endTime / 1000);
-                manager = info.manager;
-                managerId = info.managerId;
-                sourceBelongIdC = Number(info.sourceBelongId);
-                courseSyncFlag = info.courseSyncFlag;
-                levels = info.level;
-                systemid = info.systemId;
-                boeFlag = info.boeFlag;
-              }
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-        }
       }
-  
-      const backPage = () => {
-        storage.remove("projectAddId");
-        setTimeout(() => {
-          router.push({
-            path: "/libraryAdd",
-          });
-        }, 400);
-      };
-  
-      const router = useRouter();
-      const state = reactive({
-        classifySelect: null,
-        classifySelectId: null,
-        checked: false,
-        checked1: false,
-        valueE: null,
-        valueE1: null,
-        valueE2: null,
-        classifySelect1: [],
-        classifySelect2: [],
-        classifySelect3: [],
-        classifySelect4: [],
-        rangevalue: [],
-  
-        currentPage: 1, //当前页
-        tableDataTotal: -1, //模版列表总数
-        pageSize: 10, //每页10条数据
-        totalPages: 0, //总页数
-        viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
-      });
-  
-      const projectName = ref("");
-  
-      const classifyList = ref([
-        { value: 1, label: "管理者" },
-        { value: 2, label: "领军者" },
-        { value: 3, label: "产业人" },
-      ]);
-  
-      let projectType = "";
-  
-      const classificationChange = (value) => {
-        console.log(`selected ${value}`);
-        projectType = value;
-      };
-  
-      function getBase64(img, callback) {
-        const reader = new FileReader();
-        reader.addEventListener("load", () => callback(reader.result));
-        reader.readAsDataURL(img);
-      }
-  
-      const fileList = ref([]);
-      const fileList1 = ref([]);
-      const loading = ref(false);
-      const imageUrl = ref("");
-      let picUrl = "";
-  
-      const handleChange = (info) => {
-        if (info.file.status === "uploading") {
-          loading.value = true;
-          return;
-        }
-        if (info.file.status === "done") {
-          console.log("上传图片返回的信息 %o", info);
-          picUrl = info.file.response.data;
-          // Get this url from response in real world.
-          getBase64(info.file.originFileObj, (base64Url) => {
-            imageUrl.value = base64Url;
-            loading.value = false;
-          });
-        }
-        if (info.file.status === "error") {
-          loading.value = false;
-          message.error("upload error");
-        }
-      };
-  
-      let uplodaFileCount = false;
-  
-      let attach = "";
-      let attachData = "";
-      const handleChange1 = (info) => {
-        if (info.file.status === "uploading") {
-          loading.value = true;
-          return;
-        }
-        if (info.file.status === "done") {
-          console.log(
-            "上传附件返回的信息 %o",
-            info,
-            info.fileList.length,
-            uplodaFileCount
-          );
-  
-          let attachStr = "";
-          attachData = info.fileList;
-          for (let i = 0; i < attachData.length; i++) {
-            if (attachData.length - 1 == i) {
-              attachStr += attachData[i].response.data;
-            } else {
-              attachStr += attachData[i].response.data + ",";
-            }
-          }
-          console.log(attachStr);
-          attach = attachStr;
-  
-          if (info.fileList.length > 5) {
-            uplodaFileCount = true;
-          } else {
-            uplodaFileCount = false;
-          }
-        }
-        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 beforeUpload1 = () => {
-        return new Promise((resovle, reject) => {
-          if (uplodaFileCount) {
-            message.info("上传文件数量已达最大数量");
-            return reject(false);
-          }
-          return resovle(true);
+    }
+
+    const backPage = () => {
+      storage.remove("projectAddId");
+      setTimeout(() => {
+        router.push({
+          path: "/manage/libraryAdd",
         });
-      };
-  
-      let beginTime = "";
-      let endTime = "";
-      const dateFormatList = ["YYYY/MM/DD"];
-  
-      const onRangeChange = (value, dateString) => {
-        console.log("Selected Time: ", value);
-        // 项目时间选择函数
-        console.log("Formatted Selected Time: ", dateString);
+      }, 400);
+    };
+
+    const router = useRouter();
+    const state = reactive({
+      classifySelect: null,
+      classifySelectId: null,
+      checked: false,
+      checked1: false,
+      valueE: null,
+      valueE1: null,
+      valueE2: null,
+      classifySelect1: [],
+      classifySelect2: [],
+      classifySelect3: [],
+      classifySelect4: [],
+      rangevalue: [],
+
+      currentPage: 1, //当前页
+      tableDataTotal: -1, //模版列表总数
+      pageSize: 10, //每页10条数据
+      totalPages: 0, //总页数
+      viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+    });
+
+    const projectName = ref("");
+
+    const classifyList = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
+
+    let projectType = "";
+
+    const classificationChange = (value) => {
+      console.log(`selected ${value}`);
+      projectType = value;
+    };
+
+    function getBase64(img, callback) {
+      const reader = new FileReader();
+      reader.addEventListener("load", () => callback(reader.result));
+      reader.readAsDataURL(img);
+    }
+
+    const fileList = ref([]);
+    const fileList1 = ref([]);
+    const loading = ref(false);
+    const imageUrl = ref("");
+    let picUrl = "";
+
+    const handleChange = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log("上传图片返回的信息 %o", info);
+        picUrl = info.file.response.data;
+        // Get this url from response in real world.
+        getBase64(info.file.originFileObj, (base64Url) => {
+          imageUrl.value = base64Url;
+          loading.value = false;
+        });
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
+
+    let uplodaFileCount = false;
+
+    let attach = "";
+    let attachData = "";
+    const handleChange1 = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
         console.log(
-          "Formatted Selected TimeStamp",
-          new Date(dateString[0]).getTime()
+          "上传附件返回的信息 %o",
+          info,
+          info.fileList.length,
+          uplodaFileCount
         );
-        beginTime = new Date(dateString[0]).getTime() / 1000;
-        endTime = new Date(dateString[1]).getTime() / 1000;
-      };
-  
-      // 项目经理 后续接口调用
-      const classifyList1 = ref([
-        { value: 1, label: "李俊国" },
-        { value: 2, label: "将小米" },
-        { value: 3, label: "刘孟君" },
-      ]);
-  
-      let manager = "";
-      let managerId = "";
-      const classificationChange1 = (key, options) => {
-        console.log(`selected ${key}`, options);
-        let mstr = "";
-        let midstr = "";
-        for (let i = 0; i < key.length; i++) {
-          if (key.length - 1 !== i) {
-            midstr += key[i] + ",";
-            mstr += classifyList1.value[i].label + ",";
-          } else {
-            midstr += key[i];
-            mstr += classifyList1.value[i].label;
-          }
-        }
-        console.log(mstr, midstr);
-        state.classifySelect1 = options;
-        let newoptions = [];
-        for (let i = 0; i < state.classifySelect1.length; i++) {
-          if (state.classifySelect1[i].value) {
-            newoptions.push(state.classifySelect1[i]);
-          }
-        }
-        state.classifySelect1 = newoptions;
-        manager = mstr;
-        managerId = midstr;
-      };
-  
-      // 资源归属 sourceBelongId 后续给接口
-      const classifyList2 = ref([
-        { value: 1, label: "项目一" },
-        { value: 2, label: "项目二" },
-        { value: 3, label: "项目三" },
-      ]);
-  
-      let sourceBelongIdC = "";
-      const classificationChange2 = (key) => {
-        console.log(`selected ${key}`, classifyList2);
-        sourceBelongIdC = key;
-      };
-  
-      // 项目级别
-      const classifyList3 = ref([
-        { value: 1, label: "集团级" },
-        { value: 2, label: "组织级" },
-        { value: 3, label: "现地级" },
-        { value: 4, label: "部门级" },
-      ]);
-  
-      let levels = "";
-      const classificationChange3 = (key) => {
-        console.log(`selected ${key}`, classifyList3);
-        levels = key;
-      };
-  
-      // 培训体系
-      const classifyList4 = ref([
-        { value: 1, label: "集团级" },
-        { value: 2, label: "组织级" },
-        { value: 3, label: "现地级" },
-        { value: 4, label: "部门级" },
-      ]);
-  
-      let systemid = "";
-      const classificationChange4 = (key) => {
-        console.log(`selected ${key}`, classifyList4);
-        systemid = key;
-      };
-  
-      // 模版
-      const classifyList5 = ref([
-        // { value: 1, label: "模版一" },
-        // { value: 2, label: "模版二" },
-        // { value: 3, label: "模版三" },
-        // { value: 4, label: "模版四" },
-      ]);
-      const classificationChange5 = (key) => {
-        console.log(`selected ${key}`, classifyList5.value);
-        //获取模版信息
-        let obj = {
-          projectId: Number(key),
-        };
-        api
-          .getProjectDetail(obj)
-          .then((res) => {
-            console.log("获取项目详情", res);
-            if (res.status === 200) {
-              let info = res.data.data.projectInfo;
-              console.log(info);
-              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-              projectName.value = info.name;
-              state.classifySelect = classifyList.value[1]; // info.category
-              imageUrl.value = info.picUrl;
-  
-              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-              state.rangevalue = [
-                dayjs(start, "YYYY/MM/DD"),
-                dayjs(end, "YYYY/MM/DD"),
-              ];
-  
-              let manageName = info.manager.split(",");
-              let manageValue = info.managerId.split(",");
-              let optionsManage = [];
-              for (let i = 0; i < manageName.length; i++) {
-                let obj = {
-                  label: manageName[i],
-                  value: manageValue[i],
-                };
-                optionsManage.push(obj);
-              }
-              console.log(optionsManage);
-              state.classifySelect1 = optionsManage;
-              state.classifySelect2 =
-                classifyList2.value[info.sourceBelongId - 1];
-              remark.value = info.remark;
-              state.checked = info.boeFlag ? info.boeFlag : false;
-              state.classifySelect3 = classifyList3.value[info.level];
-              state.classifySelect4 = classifyList4.value[info.systemId - 1];
-              state.checked1 = info.boeFlag ? info.boeFlag : false;
-              // fileList1.value = info.attach.split(",");
-  
-              projectType = 1;
-              picUrl = info.picUrl;
-              beginTime = Number(info.beginTime / 1000);
-              endTime = Number(info.endTime / 1000);
-              manager = info.manager;
-              managerId = info.managerId;
-              sourceBelongIdC = Number(info.sourceBelongId);
-              courseSyncFlag = info.courseSyncFlag;
-              levels = info.level;
-              systemid = info.systemId;
-              boeFlag = info.boeFlag;
-            }
-          })
-          .catch((err) => {
-            console.log("获取详情失败", err);
-          });
-      };
-      //获取模版列表
-      const getTemplate = () => {
-        let obj = {
-          pageNo: state.currentPage,
-          pageSize: state.pageSize,
-          // projectId:id?id:''
-        };
-        api
-          .getProjectList(obj)
-          .then((res) => {
-            console.log("获取模版列表", res);
-            state.totalPages = Number(res.data.data.pages);
-            if (res.status === 200) {
-              let arr = res.data.data.rows;
-              let array = classifyList5.value;
-              arr.map((value) => {
-                let obj = {
-                  value: value.projectId,
-                  label: value.name,
-                };
-                array.push(obj);
-              });
-              classifyList5.value = array;
-            }
-          })
-          .catch((err) => {
-            console.log("获取模版列表失败", err);
-          });
-      };
-      getTemplate();
-      //模版滚动加载信息
-      const templateScroll = (e) => {
-        // console.log("滚动", e, b);
-        const { target } = e;
-        const scrllHeight = target.scrollHeight - target.scrollTop;
-        const clientHeight = target.clientHeight;
-        // console.log("scrllHeight", scrllHeight, clientHeight);
-        if (scrllHeight === 0 && clientHeight === 0) {
-          state.currentPage = 1;
-        } else if (scrllHeight - clientHeight == 0) {
-          // 下拉到底部时
-          if (state.currentPage < state.totalPages) {
-            // 如果滑到底部，则加载下一页
-            state.currentPage++;
-            getTemplate();
-          }
-        }
-      };
-  
-      // 项目说明
-      const remark = ref("");
-  
-      let courseSyncFlag = 0;
-      const changeChecked = () => {
-        console.log(state.checked);
-        state.checked ? (state.checked = false) : (state.checked = true);
-        courseSyncFlag = state.checked ? 1 : 0;
-      };
-  
-      let boeFlag = 0;
-      const changeChecked1 = () => {
-        console.log(state.checked1);
-        state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-        boeFlag = state.checked1 ? 1 : 0;
-      };
-  
-      const removeFile = (file) => {
-        const index = fileList1.value.indexOf(file);
-        const newFileList = fileList1.value.slice();
-        newFileList.splice(index, 1);
-        fileList1.value = newFileList;
-  
+
         let attachStr = "";
-        if (newFileList.length == 0) {
-          attachStr = "";
-        }
-        for (let i = 0; i < fileList1["value"].length; i++) {
-          console.log(fileList1["value"][i].response.data);
-          if (fileList1["value"].length - 1 == i) {
-            attachStr += fileList1["value"][i].response.data;
+        attachData = info.fileList;
+        for (let i = 0; i < attachData.length; i++) {
+          if (attachData.length - 1 == i) {
+            attachStr += attachData[i].response.data;
           } else {
-            attachStr += fileList1["value"][i].response.data + ",";
+            attachStr += attachData[i].response.data + ",";
           }
         }
+        console.log(attachStr);
         attach = attachStr;
+
+        if (info.fileList.length > 5) {
+          uplodaFileCount = true;
+        } else {
+          uplodaFileCount = false;
+        }
+      }
+      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 beforeUpload1 = () => {
+      return new Promise((resovle, reject) => {
+        if (uplodaFileCount) {
+          message.info("上传文件数量已达最大数量");
+          return reject(false);
+        }
+        return resovle(true);
+      });
+    };
+
+    let beginTime = "";
+    let endTime = "";
+    const dateFormatList = ["YYYY/MM/DD"];
+
+    const onRangeChange = (value, dateString) => {
+      console.log("Selected Time: ", value);
+      // 项目时间选择函数
+      console.log("Formatted Selected Time: ", dateString);
+      console.log(
+        "Formatted Selected TimeStamp",
+        new Date(dateString[0]).getTime()
+      );
+      beginTime = new Date(dateString[0]).getTime() / 1000;
+      endTime = new Date(dateString[1]).getTime() / 1000;
+    };
+
+    // 项目经理 后续接口调用
+    const classifyList1 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
+
+    let manager = "";
+    let managerId = "";
+    const classificationChange1 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      state.classifySelect1 = options;
+      let newoptions = [];
+      for (let i = 0; i < state.classifySelect1.length; i++) {
+        if (state.classifySelect1[i].value) {
+          newoptions.push(state.classifySelect1[i]);
+        }
+      }
+      state.classifySelect1 = newoptions;
+      manager = mstr;
+      managerId = midstr;
+    };
+
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList2 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
+
+    let sourceBelongIdC = "";
+    const classificationChange2 = (key) => {
+      console.log(`selected ${key}`, classifyList2);
+      sourceBelongIdC = key;
+    };
+
+    // 项目级别
+    const classifyList3 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
+
+    let levels = "";
+    const classificationChange3 = (key) => {
+      console.log(`selected ${key}`, classifyList3);
+      levels = key;
+    };
+
+    // 培训体系
+    const classifyList4 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
+
+    let systemid = "";
+    const classificationChange4 = (key) => {
+      console.log(`selected ${key}`, classifyList4);
+      systemid = key;
+    };
+
+    // 模版
+    const classifyList5 = ref([
+      // { value: 1, label: "模版一" },
+      // { value: 2, label: "模版二" },
+      // { value: 3, label: "模版三" },
+      // { value: 4, label: "模版四" },
+    ]);
+    const classificationChange5 = (key) => {
+      console.log(`selected ${key}`, classifyList5.value);
+      //获取模版信息
+      let obj = {
+        projectId: Number(key),
       };
-  
-      const errorMsgs = {
-        name: "请输入项目名称",
-        category: "请选择项目分类",
-        picUrl: "请上传项目封面图",
-        beginTime: "请选择项目开始时间",
-        endTime: "请选择项目结束时间",
-        manager: "请选择项目经理",
-        managerId: "请选择项目经理",
-        sourceBelongId: "请选择资源归属",
-        level: "请填写项目级别",
-        systemId: "请填写项目培训体系",
-        boeFlag: "请选择是否BOE实施",
-      };
-  
-      const createProject = () => {
-        console.log("我是否要编辑项目", isEdit.value);
-        if (isEdit.value) {
-          console.log("我要编辑项目", peojectID);
-          let obj = {
-            projectId: Number(peojectID),
-            name: projectName["value"],
-            category: projectType,
-            picUrl: picUrl,
-            beginTime: beginTime,
-            endTime: endTime,
-            manager: manager,
-            managerId: managerId,
-            sourceBelongId: sourceBelongIdC,
-            remark: remark["value"],
-            courseSyncFlag: courseSyncFlag,
-            level: levels,
-            systemId: systemid,
-            boeFlag: boeFlag,
-            attach: attach,
-            type: 3,
-            templateId: 0,
-            parentId: 0,
-            notice: "",
-            noticeFlag: 0,
-            status: 0,
-          };
-  
-          console.log(obj);
-  
-          for (let i in errorMsgs) {
-            console.log(obj[i]);
-            if (obj[i] === "" || obj[i] === undefined) {
-              message.destroy();
-              message.warning(errorMsgs[i]);
-              return;
+      api
+        .getProjectDetail(obj)
+        .then((res) => {
+          console.log("获取项目详情", res);
+          if (res.status === 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
+
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
+
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
             }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
+
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
           }
-  
-          api
-            .createProject(obj)
-            .then((res) => {
-              console.log(res);
-              if (res.status == 200 && res.data.code == 200) {
-                message.destroy();
-                message.success("编辑成功");
-                setTimeout(() => {
-                  router.push({
-                    path: "/projectmanage",
-                  });
-                }, 1000);
-              } else {
-                message.destroy();
-                message.error("编辑失败，请检查当前网络状态。");
-              }
-            })
-            .catch((err) => {
-              console.log(err);
+        })
+        .catch((err) => {
+          console.log("获取详情失败", err);
+        });
+    };
+    //获取模版列表
+    const getTemplate = () => {
+      let obj = {
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        // projectId:id?id:''
+      };
+      api
+        .getProjectList(obj)
+        .then((res) => {
+          console.log("获取模版列表", res);
+          state.totalPages = Number(res.data.data.pages);
+          if (res.status === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList5.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.projectId,
+                label: value.name,
+              };
+              array.push(obj);
+            });
+            classifyList5.value = array;
+          }
+        })
+        .catch((err) => {
+          console.log("获取模版列表失败", err);
+        });
+    };
+    getTemplate();
+    //模版滚动加载信息
+    const templateScroll = (e) => {
+      // console.log("滚动", e, b);
+      const { target } = e;
+      const scrllHeight = target.scrollHeight - target.scrollTop;
+      const clientHeight = target.clientHeight;
+      // console.log("scrllHeight", scrllHeight, clientHeight);
+      if (scrllHeight === 0 && clientHeight === 0) {
+        state.currentPage = 1;
+      } else if (scrllHeight - clientHeight == 0) {
+        // 下拉到底部时
+        if (state.currentPage < state.totalPages) {
+          // 如果滑到底部，则加载下一页
+          state.currentPage++;
+          getTemplate();
+        }
+      }
+    };
+
+    // 项目说明
+    const remark = ref("");
+
+    let courseSyncFlag = 0;
+    const changeChecked = () => {
+      console.log(state.checked);
+      state.checked ? (state.checked = false) : (state.checked = true);
+      courseSyncFlag = state.checked ? 1 : 0;
+    };
+
+    let boeFlag = 0;
+    const changeChecked1 = () => {
+      console.log(state.checked1);
+      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+      boeFlag = state.checked1 ? 1 : 0;
+    };
+
+    const removeFile = (file) => {
+      const index = fileList1.value.indexOf(file);
+      const newFileList = fileList1.value.slice();
+      newFileList.splice(index, 1);
+      fileList1.value = newFileList;
+
+      let attachStr = "";
+      if (newFileList.length == 0) {
+        attachStr = "";
+      }
+      for (let i = 0; i < fileList1["value"].length; i++) {
+        console.log(fileList1["value"][i].response.data);
+        if (fileList1["value"].length - 1 == i) {
+          attachStr += fileList1["value"][i].response.data;
+        } else {
+          attachStr += fileList1["value"][i].response.data + ",";
+        }
+      }
+      attach = attachStr;
+    };
+
+    const errorMsgs = {
+      name: "请输入项目名称",
+      category: "请选择项目分类",
+      picUrl: "请上传项目封面图",
+      beginTime: "请选择项目开始时间",
+      endTime: "请选择项目结束时间",
+      manager: "请选择项目经理",
+      managerId: "请选择项目经理",
+      sourceBelongId: "请选择资源归属",
+      level: "请填写项目级别",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOE实施",
+    };
+
+    const createProject = () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      if (isEdit.value) {
+        console.log("我要编辑项目", peojectID);
+        let obj = {
+          projectId: Number(peojectID),
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 0,
+          parentId: 0,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
+
+        console.log(obj);
+
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
+
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("编辑成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/manage/projectmanage",
+                });
+              }, 1000);
+            } else {
               message.destroy();
               message.error("编辑失败，请检查当前网络状态。");
-            });
-        } else {
-          let obj = {
-            name: projectName["value"],
-            category: projectType,
-            picUrl: picUrl,
-            beginTime: beginTime,
-            endTime: endTime,
-            manager: manager,
-            managerId: managerId,
-            sourceBelongId: sourceBelongIdC,
-            remark: remark["value"],
-            courseSyncFlag: courseSyncFlag,
-            level: levels,
-            systemId: systemid,
-            boeFlag: boeFlag,
-            attach: attach,
-            type: 3,
-            templateId: 10,
-            parentId: 0,
-            notice: "",
-            noticeFlag: 0,
-            status: 0,
-          };
-          console.log("提交的数据格式 %o", obj);
-          for (let i in errorMsgs) {
-            console.log(obj[i]);
-            if (obj[i] === "" || obj[i] === undefined) {
-              message.destroy();
-              message.warning(errorMsgs[i]);
-              return;
             }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("编辑失败，请检查当前网络状态。");
+          });
+      } else {
+        let obj = {
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 10,
+          parentId: 0,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
+        console.log("提交的数据格式 %o", obj);
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
           }
-  
-          api
-            .createProject(obj)
-            .then((res) => {
-              console.log(res);
-              if (res.status == 200 && res.data.code == 200) {
-                message.destroy();
-                message.success("创建成功");
-                setTimeout(() => {
-                  router.push({
-                    path: "/taskpage",
-                    query: { id: res.data.data.projectId },
-                  });
-                }, 1000);
-              } else {
-                message.destroy();
-                message.error("创建失败，请检查当前网络状态。");
-              }
-            })
-            .catch((err) => {
-              console.log(err);
+        }
+
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("创建成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/manage/taskpage",
+                  query: { id: res.data.data.projectId },
+                });
+              }, 1000);
+            } else {
               message.destroy();
               message.error("创建失败，请检查当前网络状态。");
-            });
-        }
-      };
-  
-      return {
-        ...toRefs(state),
-        projectName,
-        classifyList,
-        classificationChange,
-        classificationChange1,
-        classificationChange2,
-        classificationChange3,
-        classificationChange4,
-        classificationChange5,
-        fileList,
-        fileList1,
-        loading,
-        imageUrl,
-        handleChange,
-        handleChange1,
-        beforeUpload,
-        beforeUpload1,
-        onRangeChange,
-        classifyList1,
-        classifyList2,
-        classifyList3,
-        classifyList4,
-        classifyList5,
-        remark,
-        changeChecked,
-        changeChecked1,
-        uplodaFileCount,
-        createProject,
-        removeFile,
-  
-        isEdit,
-        backPage,
-        dateFormatList,
-  
-        templateScroll,
-      };
-    },
-  };
-  </script>
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("创建失败，请检查当前网络状态。");
+          });
+      }
+    };
+
+    return {
+      ...toRefs(state),
+      projectName,
+      classifyList,
+      classificationChange,
+      classificationChange1,
+      classificationChange2,
+      classificationChange3,
+      classificationChange4,
+      classificationChange5,
+      fileList,
+      fileList1,
+      loading,
+      imageUrl,
+      handleChange,
+      handleChange1,
+      beforeUpload,
+      beforeUpload1,
+      onRangeChange,
+      classifyList1,
+      classifyList2,
+      classifyList3,
+      classifyList4,
+      classifyList5,
+      remark,
+      changeChecked,
+      changeChecked1,
+      uplodaFileCount,
+      createProject,
+      removeFile,
+
+      isEdit,
+      backPage,
+      dateFormatList,
+
+      templateScroll,
+    };
+  },
+};
+</script>
   <style lang="scss">
-  .projectAdd {
+.projectAdd {
+  width: 100%;
+  // height: inherit;
+  // flex: 1;
+  // flex-shrink: 0;
+  // overflow-y: auto;
+
+  .header {
     width: 100%;
-    // height: inherit;
-    // flex: 1;
-    // flex-shrink: 0;
-    // overflow-y: auto;
-  
-    .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;
-        }
-      }
+    display: flex;
+    justify-content: space-between;
+
+    .title {
+      color: #000000;
+      font-size: 18px;
+      //line-height: 36px;
+      padding-top: 30px;
+      padding-left: 37px;
+      //font-weight: 500;
     }
-  
-    // 修改 antd upload 样式
-    .ant-upload {
-      border-width: 0px;
-    }
-  
-    .content {
-      display: flex;
-  
-      .main {
-        width: 50%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        //justify-content: center;
-        float: left;
-        border-right: 1px solid rgba(153, 155, 163, 0.3);
-  
-        .name {
-          width: 78%;
-          // 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;
-            }
-          }
-  
-          .d {
-            margin-top: 8px;
-            font-size: 25px;
-            color: #ff4e4e;
-          }
-  
-          .box {
-            position: relative;
-            margin-left: 14px;
-  
-            .box1 {
-              position: absolute;
-              left: 50%;
-              top: 50%;
-              width: 50px;
-              margin-left: -25px;
-              margin-top: -5px;
-              border-top: 2px solid rgba(78, 166, 255, 1);
-            }
-  
-            .box2 {
-              position: absolute;
-              left: 50%;
-              top: 50%;
-              height: 50px;
-              //margin-left: -5px;
-              margin-top: -25px;
-              border-left: 2px solid rgba(78, 166, 255, 1);
-            }
-          }
-  
-          .inname {
-            color: #6f6f6f;
-            font-size: 14px;
-            margin-left: 7px;
-          }
-  
-          .in {
-            margin-left: 14px;
-            flex: 1;
-  
-            // .ant-radio-wrapper {
-            // }
-            .ant-input-textarea-show-count {
-              position: relative;
-              height: 88px;
-            }
-  
-            .ant-input-textarea-show-count::after {
-              position: absolute;
-              right: 10px;
-              bottom: 0px;
-            }
-  
-            .ant-input {
-              border-radius: 8px;
-              // height: 120%;
-              width: 100%;
-              height: 40px;
-            }
-  
-            .ant-input-affix-wrapper {
-              padding: 0 11px;
-              border-radius: 8px;
-            }
-  
-            .ant-select-selector {
-              border-radius: 5px;
-              // height: 120%;
-              width: 100%;
-              // height: 40px;
-            }
-          }
-  
-          .filebox {
-            margin-left: 14px;
-            flex: 1;
-  
-            .fileimg {
-              width: 15px;
-              height: 15px;
-              margin-right: 6px;
-            }
-  
-            .filetext {
-              font-size: 14px;
-              font-weight: 400;
-              color: #4ea6ff;
-              line-height: 36px;
-            }
-  
-            .support {
-              font-size: 14px;
-              font-weight: 400;
-              color: #999ba3;
-              line-height: 36px;
-              margin-top: 8px;
-              word-break: break-all;
-            }
-          }
-        }
-  
-        .name2 {
-          display: flex;
-          align-items: flex-start;
-  
-          .ant-input-textarea {
-            .ant-input {
-              height: 88px;
-            }
-          }
-        }
+
+    .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");
       }
-  
-      .template {
-        width: 50%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        //justify-content: center;
-        float: right;
-  
-        .name {
-          width: 78%;
-          // background-color: lightcoral;
-          display: flex;
-          margin-top: 20px;
-          align-items: center;
-          height: 40px;
-  
-          // border: 1px solid black;
-          .d {
-            margin-top: 8px;
-            font-size: 25px;
-            color: #ff4e4e;
-          }
-  
-          .inname {
-            color: #6f6f6f;
-            font-size: 14px;
-            margin-left: 7px;
-            width: 65px;
-          }
-  
-          .in {
-            margin-left: 14px;
-            width: 81%;
-  
-            .ant-input {
-              border-radius: 5px;
-              // height: 120%;
-              width: 100%;
-              height: 40px;
-            }
-  
-            .ant-select-selector {
-              border-radius: 5px;
-              // height: 120%;
-              width: 100%;
-              height: 40px;
-            }
-          }
-        }
-      }
-    }
-  
-    .footer {
-      width: 100%;
-      margin-top: 31px;
-      margin-bottom: 14px;
-      padding-bottom: 20px;
-  
-      .btn {
-        display: flex;
-        justify-content: center;
-  
-        .btn1 {
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          width: 100px;
-          height: 40px;
-          border-radius: 8px;
-          background: #409eff;
-          color: #ffffff;
-          margin-right: 14px;
-        }
-  
-        .btn2 {
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          width: 100px;
-          height: 40px;
-          border-radius: 8px;
-          border: 1px solid #409eff;
-          background: #ffffff;
-          color: #409eff;
-        }
-      }
-  
-      .text {
-        color: rgba(153, 155, 163, 1);
+
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
         font-size: 14px;
-        margin-left: 223px;
       }
     }
   }
-  </style>
+
+  // 修改 antd upload 样式
+  .ant-upload {
+    border-width: 0px;
+  }
+
+  .content {
+    display: flex;
+
+    .main {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: left;
+      border-right: 1px solid rgba(153, 155, 163, 0.3);
+
+      .name {
+        width: 78%;
+        // 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;
+          }
+        }
+
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
+
+        .box {
+          position: relative;
+          margin-left: 14px;
+
+          .box1 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            margin-left: -25px;
+            margin-top: -5px;
+            border-top: 2px solid rgba(78, 166, 255, 1);
+          }
+
+          .box2 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 50px;
+            //margin-left: -5px;
+            margin-top: -25px;
+            border-left: 2px solid rgba(78, 166, 255, 1);
+          }
+        }
+
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+        }
+
+        .in {
+          margin-left: 14px;
+          flex: 1;
+
+          // .ant-radio-wrapper {
+          // }
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
+
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 0px;
+          }
+
+          .ant-input {
+            border-radius: 8px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
+
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            // height: 40px;
+          }
+        }
+
+        .filebox {
+          margin-left: 14px;
+          flex: 1;
+
+          .fileimg {
+            width: 15px;
+            height: 15px;
+            margin-right: 6px;
+          }
+
+          .filetext {
+            font-size: 14px;
+            font-weight: 400;
+            color: #4ea6ff;
+            line-height: 36px;
+          }
+
+          .support {
+            font-size: 14px;
+            font-weight: 400;
+            color: #999ba3;
+            line-height: 36px;
+            margin-top: 8px;
+            word-break: break-all;
+          }
+        }
+      }
+
+      .name2 {
+        display: flex;
+        align-items: flex-start;
+
+        .ant-input-textarea {
+          .ant-input {
+            height: 88px;
+          }
+        }
+      }
+    }
+
+    .template {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: right;
+
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        height: 40px;
+
+        // border: 1px solid black;
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
+
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+          width: 65px;
+        }
+
+        .in {
+          margin-left: 14px;
+          width: 81%;
+
+          .ant-input {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
+      }
+    }
+  }
+
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    padding-bottom: 20px;
+
+    .btn {
+      display: flex;
+      justify-content: center;
+
+      .btn1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        background: #409eff;
+        color: #ffffff;
+        margin-right: 14px;
+      }
+
+      .btn2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        border: 1px solid #409eff;
+        background: #ffffff;
+        color: #409eff;
+      }
+    }
+
+    .text {
+      color: rgba(153, 155, 163, 1);
+      font-size: 14px;
+      margin-left: 223px;
+    }
+  }
+}
+</style>
   
\ No newline at end of file
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index dd7aec0e..3008b51f 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -10,9 +10,9 @@
               导出信息
             </span>
           </div>
-          <router-link to="/researchmanage" class="goback">
+          <router-link to="/manage/researchmanage" class="goback">
             <span class="return"></span>
-            <router-link class="returntext" to="/researchmanage">
+            <router-link class="returntext" to="/manage/researchmanage">
               返回
             </router-link>
           </router-link>
diff --git a/src/views/research/ResearchAdd copy.vue b/src/views/research/ResearchAdd copy.vue
index b2ad3d38..a8593eed 100644
--- a/src/views/research/ResearchAdd copy.vue	
+++ b/src/views/research/ResearchAdd copy.vue	
@@ -3,9 +3,9 @@
   <div class="researchadd">
     <div class="header">
       <span class="title">创建评估</span>
-      <router-link to="/researchmanage" class="goback">
+      <router-link to="/manage/researchmanage" class="goback">
         <span class="return"></span>
-        <router-link class="returntext" to="/researchmanage">
+        <router-link class="returntext" to="/manage/researchmanage">
           返回
         </router-link>
       </router-link>
@@ -401,7 +401,9 @@ export default {
       if (state.assessmentId) {
         resultPost = {
           assessmentId: state.assessmentId,
-          assessmentName: state.assessmentName ? state.assessmentName : "编辑测试",
+          assessmentName: state.assessmentName
+            ? state.assessmentName
+            : "编辑测试",
           assessmentMark: state.assessmentMark,
           ...filterData,
         };
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 3a97ca47..d7562fb0 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -3,9 +3,9 @@
   <div class="researchadd">
     <div class="header">
       <span class="title">创建评估</span>
-      <router-link to="/researchmanage" class="goback">
+      <router-link to="/manage/researchmanage" class="goback">
         <span class="return"></span>
-        <router-link class="returntext" to="/researchmanage">
+        <router-link class="returntext" to="/manage/researchmanage">
           返回
         </router-link>
       </router-link>
@@ -499,7 +499,7 @@ export default {
           if (res.data.code === 200) {
             message.success("编辑成功");
             router.push({
-              path: "/researchmanage",
+              path: "/manage/researchmanage",
             });
           }
         });
@@ -517,7 +517,7 @@ export default {
           if (res.data.code === 200) {
             message.success("创建成功");
             router.push({
-              path: "/researchmanage",
+              path: "/manage/researchmanage",
             });
           }
         });
@@ -526,7 +526,7 @@ export default {
     const handleAllCancel = () => {
       state.allFormsData = [];
       router.push({
-        path: "/researchmanage",
+        path: "/manage/researchmanage",
       });
     };
     const checkVal = (filterData) => {
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 6e56bc80..3e972ffd 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -428,7 +428,7 @@ export default {
                   <div
                     class="jc"
                     onClick={() => {
-                      handleToManagepage(value, "/managepage");
+                      handleToManagepage(value, "/manage/managepage");
                     }}
                   >
                     管理
@@ -474,7 +474,7 @@ export default {
                   <div
                     class="jc"
                     onClick={() => {
-                      handleToResearchadd(value, "/researchadd");
+                      handleToResearchadd(value, "/manage/researchadd");
                     }}
                   >
                     基础信息
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 347c9d8b..187f212b 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -327,7 +327,7 @@ export default {
     };
     const router = useRouter();
     const golearningpath = () => {
-      router.push({ path: "/learningpath", params: { id: 1 } });
+      router.push({ path: "/manage/learningpath", params: { id: 1 } });
     };
 
     //下载二维码图片
diff --git a/vue.config.js b/vue.config.js
index dc5c008b..d7532e53 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,17 +1,25 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-21 14:32:52
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-21 15:15:30
+ * @FilePath: /fe-manage/vue.config.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
   // transpileDependencies: true,
   devServer: {
-    port:8080,
+    port: 8080,
     proxy: {
-      "/api": {
+      "/manageApi": {
         // target:"http://192.168.100.208:30001",
         target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
         changeOrigin: true, //表示是否改变原域名
         // secure: false,
         // ws: false, //表示WebSocket协议
         pathRewrite: {
-          "^/api": "",
+          "^/manageApi": "",
         },
       },
     },

From 170c1a6d002f3bb963f19f0acbf24506715f8434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Mon, 21 Nov 2022 15:51:55 +0800
Subject: [PATCH 79/90] =?UTF-8?q?feat=EF=BC=9A=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue | 1085 +++++++++++++--------------
 1 file changed, 533 insertions(+), 552 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index def8e4c5..1d60d385 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -12,27 +12,13 @@
       <div class="right">
         <img class="img1" src="../../assets/images/leveladd/ma.png" />
         <div v-if="action == 1 || action == 0" class="line"></div>
-        <img
-          v-if="action == 1 || action == 0"
-          class="img2"
-          src="../../assets/images/leveladd/pub.png"
-        />
+        <img v-if="action == 1 || action == 0" class="img2" src="../../assets/images/leveladd/pub.png" />
         <!-- 已发布的显示 -->
-        <div
-          class="pub"
-          style="width: 28px"
-          v-if="action == 1"
-          @click="showBackModal"
-        >
+        <div class="pub" style="width: 28px" v-if="action == 1" @click="showBackModal">
           {{ act }}
         </div>
         <!-- 未发布/草稿的显示 -->
-        <div
-          class="pub"
-          style="width: 28px"
-          v-if="action == 0"
-          @click="showPub"
-        >
+        <div class="pub" style="width: 28px" v-if="action == 0" @click="showPub">
           {{ act }}
         </div>
         <!-- 已结束的显示 -->
@@ -40,11 +26,7 @@
           {{ act }}
         </div> -->
         <div class="line"></div>
-        <img
-          style="margin-right: 15px"
-          class="img2"
-          src="../../assets/images/leveladd/more.png"
-        />
+        <img style="margin-right: 15px" class="img2" src="../../assets/images/leveladd/more.png" />
         <!-- 草稿/未发布的显示 -->
         <div class="more" v-if="action == 0">
           <span style="color: #7096e3; cursor: pointer">更多</span>
@@ -73,23 +55,18 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/manage/learningpath"
-          ><div style="display: flex">
+        <router-link to="/manage/learningpath">
+          <div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
-          </div></router-link
-        >
+          </div>
+        </router-link>
       </div>
     </div>
     <div class="split"></div>
     <div class="bom clearfix">
-      <a-tabs
-        class="tab"
-        v-model:activeKey="activeKey"
-        size="large"
-        @change="changeTabs"
-        :tabBarStyle="{ marginLeft: '10px' }"
-      >
+      <a-tabs class="tab" v-model:activeKey="activeKey" size="large" @change="changeTabs"
+        :tabBarStyle="{ marginLeft: '10px' }">
         <a-tab-pane key="1" tab="概览">
           <div class="split"></div>
           <!-- 概览（无数据） -->
@@ -99,10 +76,7 @@
             </div>
             <div class="second">
               <router-link :to="{ path: '/manage/leveladddetail' }">
-                <div
-                  class="taskbox"
-                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
-                >
+                <div class="taskbox" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)">
                   <div class="leftt">
                     <img src="../../assets/images/taskpage/left1.png" />
                   </div>
@@ -118,11 +92,7 @@
                   <div class="centermain">快速添加任务/关卡</div>
                 </div>
               </router-link>
-              <div
-                class="taskbox"
-                @click="showAddStu"
-                style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
-              >
+              <div class="taskbox" @click="showAddStu" style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)">
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left2.png" />
                 </div>
@@ -137,11 +107,7 @@
                 </div>
                 <div class="centermain">快速添加学员</div>
               </div>
-              <div
-                class="taskbox"
-                @click="showModal"
-                style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
-              >
+              <div class="taskbox" @click="showModal" style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)">
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left3.png" />
                 </div>
@@ -160,65 +126,61 @@
           </div>
           <!-- 概览（有数据） -->
           <div :style="{ display: nodata ? 'none' : 'block' }">
-            <div class="onerow"><div class="taskmain">关卡概览</div></div>
+            <div class="onerow">
+              <div class="taskmain">关卡概览</div>
+            </div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
                 <span class="nub1">{{
-                  routerInfoOverview.totalStudentCnt
+                    routerInfoOverview.totalStudentCnt
                 }}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
                 <span class="nub1" style="color: #ff90ae">{{
-                  routerInfoOverview.studyStudentCnt
+                    routerInfoOverview.studyStudentCnt
                 }}</span>
                 <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
                 <span class="nub1" style="color: #a497ff">{{
-                  routerInfoOverview.completeStudentCnt
+                    routerInfoOverview.completeStudentCnt
                 }}</span>
                 <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #5dc988">{{
-                    routerInfoOverview.onlineCourseCnt
-                  }}</span
-                  ><span style="color: #5dc988; font-size: 14px">%</span>
+                      routerInfoOverview.onlineCourseCnt
+                  }}</span><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">在线课程数</div>
               </div>
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #ff90ae">{{
-                    routerInfoOverview.offLineCourseCnt
-                  }}</span
-                  ><span style="color: #ff90ae; font-size: 14px">%</span>
+                      routerInfoOverview.offLineCourseCnt
+                  }}</span><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">面授课程数</div>
               </div>
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #a497ff">{{
-                    routerInfoOverview.completeRatio
-                  }}</span
-                  ><span style="color: #a497ff; font-size: 14px">%</span>
+                      routerInfoOverview.completeRatio
+                  }}</span><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">总完成率</div>
               </div>
             </div>
-            <div class="onerow"><div class="taskmain">关卡信息</div></div>
+            <div class="onerow">
+              <div class="taskmain">关卡信息</div>
+            </div>
             <div class="stagemess">
-              <div
-                v-for="item in stageList"
-                :class="{
-                  stage1: item.stageId == choosedStageId,
-                  stage2: item.stageId != choosedStageId,
-                }"
-                :key="item.stageId"
-                @click="stageChange(item.name, item.stageId)"
-              >
+              <div v-for="item in stageList" :class="{
+                stage1: item.stageId == choosedStageId,
+                stage2: item.stageId != choosedStageId,
+              }" :key="item.stageId" @click="stageChange(item.name, item.stageId)">
                 关卡{{ item.stageId }}
               </div>
               <!-- <div class="stage1">阶段1</div>
@@ -230,30 +192,17 @@
             </div>
             <div class="stagelast">
               <div class="stagepro">
-                <a-progress
-                  type="dashboard"
-                  gapDegree="0"
-                  :percent="chapterOverviewList.completeCourseRatio"
-                  :width="140"
-                />
+                <a-progress type="dashboard" gapDegree="0" :percent="chapterOverviewList.completeCourseRatio"
+                  :width="140" />
                 <div class="protext">课程完成率</div>
               </div>
               <div class="stagepro">
-                <a-progress
-                  type="dashboard"
-                  gapDegree="0"
-                  :percent="chapterOverviewList.completeExamRatio"
-                  :width="140"
-                />
+                <a-progress type="dashboard" gapDegree="0" :percent="chapterOverviewList.completeExamRatio"
+                  :width="140" />
                 <div class="protext">考试通过率</div>
               </div>
               <div class="stagepro" style="margin-right: 0">
-                <a-progress
-                  type="dashboard"
-                  gapDegree="0"
-                  :percent="chapterOverviewList.completeRatio"
-                  :width="140"
-                />
+                <a-progress type="dashboard" gapDegree="0" :percent="chapterOverviewList.completeRatio" :width="140" />
                 <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
@@ -262,30 +211,21 @@
                 </div>
                 <div class="proright1">
                   <span class="textpro">关卡任务总数</span>
-                  <a-progress
-                    :percent="chapterOverviewList.totalTaskCnt"
-                    style="width: 369px"
-                  />
+                  <a-progress :percent="chapterOverviewList.totalTaskCnt" style="width: 369px" />
                 </div>
                 <div class="pronub" style="margin-left: 206px">
                   {{ chapterOverviewList.totalReqCnt }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress
-                    :percent="chapterOverviewList.totalReqCnt"
-                    style="width: 369px"
-                  />
+                  <a-progress :percent="chapterOverviewList.totalReqCnt" style="width: 369px" />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
                   {{ chapterOverviewList.totalOptCnt }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress
-                    :percent="chapterOverviewList.totalOptCnt"
-                    style="width: 369px"
-                  />
+                  <a-progress :percent="chapterOverviewList.totalOptCnt" style="width: 369px" />
                 </div>
               </div>
             </div>
@@ -335,20 +275,14 @@
               <div class="taskmain">任务大纲</div>
 
               <router-link to="/manage/leveladddetail" class="editright">
-                <img
-                  class="editimg"
-                  src="../../assets/images/leveladd/edit.png"
-                />
+                <img class="editimg" src="../../assets/images/leveladd/edit.png" />
                 <span class="editextb">编辑</span>
               </router-link>
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
               <router-link :to="{ path: '/manage/leveladddetail' }">
-                <div
-                  class="taskbox"
-                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
-                >
+                <div class="taskbox" style="background: linear-gradient(180deg, #fef3dd, #fffaf0)">
                   <div class="leftt">
                     <img src="../../assets/images/taskpage/left1.png" />
                   </div>
@@ -371,72 +305,57 @@
             <div class="taskSyllabus">
               <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
                 <template #expandIcon="{ isActive }">
-                  <img
-                    :style="{
-                      width: isActive ? 9.1 : 8.1,
-                      height: isActive ? 8.1 : 9.1,
-                      'margin-right': isActive ? '12px' : '13px',
-                    }"
-                    :src="
-                      isActive
-                        ? require('../../assets/images/projectadd/open.png')
-                        : require('../../assets/images/projectadd/close.png')
-                    "
-                  />
+                  <img :style="{
+                    width: isActive ? 9.1 : 8.1,
+                    height: isActive ? 8.1 : 9.1,
+                    'margin-right': isActive ? '12px' : '13px',
+                  }" :src="
+  isActive
+    ? require('../../assets/images/projectadd/open.png')
+    : require('../../assets/images/projectadd/close.png')
+" />
                   <div></div>
                 </template>
-                <a-collapse-panel
-                  v-for="(value, index) in taskSyllabus"
-                  :key="index"
-                  :header="value.name"
-                >
-                  <div
-                    class="course"
-                    v-for="(item, key) in value.taskList"
-                    :key="key"
-                  >
+                <a-collapse-panel v-for="(value, index) in taskSyllabus" :key="index" :header="value.name">
+                  <div class="course" v-for="(item, key) in value.taskList" :key="key">
                     <!-- :style="{width:item.course==='在线'?'28px':
 												height:item.course==='在线'?'27px':}" -->
                     <div class="first">
                       <div class="icon">
-                        <div
-                          style="
+                        <div style="
                             width: 31px;
                             height: 28px;
                             display: flex;
                             align-items: center;
                             justify-content: center;
-                          "
-                        >
-                          <img
-                            :src="
-                              item.type === 1
-                                ? require('../../assets/images/leveladd/zai.png')
-                                : type === 2
+                          ">
+                          <img :src="
+                            item.type === 1
+                              ? require('../../assets/images/leveladd/zai.png')
+                              : type === 2
                                 ? require('../../assets/images/leveladd/mian.png')
                                 : item.type === 3
-                                ? require('../../assets/images/leveladd/an.png')
-                                : item.type === 4
-                                ? require('../../assets/images/leveladd/zuo.png')
-                                : item.type === 5
-                                ? require('../../assets/images/leveladd/kao.png')
-                                : item.type === 6
-                                ? require('../../assets/images/leveladd/zhi.png')
-                                : item.type === 7
-                                ? require('../../assets/images/leveladd/wai.png')
-                                : item.type === 8
-                                ? require('../../assets/images/leveladd/tao.png')
-                                : item.type === 9
-                                ? require('../../assets/images/leveladd/huo.png')
-                                : item.type === 10
-                                ? require('../../assets/images/leveladd/ce.png')
-                                : item.type === 11
-                                ? require('../../assets/images/leveladd/diao.png')
-                                : item.type === 12
-                                ? require('../../assets/images/leveladd/tou.png')
-                                : null
-                            "
-                          />
+                                  ? require('../../assets/images/leveladd/an.png')
+                                  : item.type === 4
+                                    ? require('../../assets/images/leveladd/zuo.png')
+                                    : item.type === 5
+                                      ? require('../../assets/images/leveladd/kao.png')
+                                      : item.type === 6
+                                        ? require('../../assets/images/leveladd/zhi.png')
+                                        : item.type === 7
+                                          ? require('../../assets/images/leveladd/wai.png')
+                                          : item.type === 8
+                                            ? require('../../assets/images/leveladd/tao.png')
+                                            : item.type === 9
+                                              ? require('../../assets/images/leveladd/huo.png')
+                                              : item.type === 10
+                                                ? require('../../assets/images/leveladd/ce.png')
+                                                : item.type === 11
+                                                  ? require('../../assets/images/leveladd/diao.png')
+                                                  : item.type === 12
+                                                    ? require('../../assets/images/leveladd/tou.png')
+                                                    : null
+                          " />
                         </div>
                       </div>
                       <div>
@@ -460,69 +379,45 @@
                         {{ item.complete }}/{{ item.total }}人
                       </div>
                       <div style="display: flex">
-                        <a-progress
-                          :showInfo="false"
-                          :percent="item.percent"
-                          strokeColor="#FFC067"
-                          trailColor="rgba(253, 209, 98, 0.2)"
-                        />
-                        <span class="progresstext" style="margin-left: 10px"
-                          >{{ item.percent }}%</span
-                        >
+                        <a-progress :showInfo="false" :percent="item.percent" strokeColor="#FFC067"
+                          trailColor="rgba(253, 209, 98, 0.2)" />
+                        <span class="progresstext" style="margin-left: 10px">{{ item.percent }}%</span>
                       </div>
                     </div>
                     <div class="operations">
-                      <div
-                        class="operation"
-                        style="cursor: pointer"
-                        :style="{
-                          display: item.type === 2 ? 'flex' : 'none',
-                        }"
-                        @click="showFS"
-                      >
+                      <div class="operation" style="cursor: pointer" :style="{
+                        display: item.type === 2 ? 'flex' : 'none',
+                      }" @click="showFS">
                         学员
                       </div>
-                      <div
-                        class="operation"
-                        style="cursor: pointer"
-                        @click="showAA(item.type, item.name)"
-                        :style="{
-                          display:
-                            item.type === 6 || item.type === 9
-                              ? 'flex'
-                              : 'none',
-                        }"
-                      >
+                      <div class="operation" style="cursor: pointer" @click="showAA(item.type, item.name)" :style="{
+                        display:
+                          item.type === 6 || item.type === 9
+                            ? 'flex'
+                            : 'none',
+                      }">
                         考勤
                       </div>
-                      <div
-                        class="operation"
-                        style="cursor: pointer"
-                        :style="{
-                          display:
-                            item.type === 6 ||
+                      <div class="operation" style="cursor: pointer" :style="{
+                        display:
+                          item.type === 6 ||
                             item.type === 9 ||
                             item.type === 2
-                              ? 'flex'
-                              : 'none',
-                        }"
-                        @click="
-                          item.type === 2
-                            ? showCopyModal(item.type)
-                            : item.type === 6
-                            ? showzhibModal(item.type)
-                            : item.type === 9
-                            ? showhuodModal(item.type)
-                            : null
-                        "
-                      >
+                            ? 'flex'
+                            : 'none',
+                      }" @click="
+  item.type === 2
+    ? showCopyModal(item.type)
+    : item.type === 6
+      ? showzhibModal(item.type)
+      : item.type === 9
+        ? showhuodModal(item.type)
+        : null
+">
                         二维码
                       </div>
-                      <div
-                        class="operation"
-                        style="cursor: pointer; margin-right: 35px"
-                        @click="
-                          item.type === 1 ||
+                      <div class="operation" style="cursor: pointer; margin-right: 35px" @click="
+                        item.type === 1 ||
                           item.type === 3 ||
                           item.type === 7 ||
                           item.type === 8 ||
@@ -530,16 +425,15 @@
                           item.type === 11 ||
                           item.type === 12 ||
                           item.type === 9
-                            ? showTime(item.type, item.name)
-                            : item.type === 5 || item.type === 10
+                          ? showTime(item.type, item.name)
+                          : item.type === 5 || item.type === 10
                             ? showTest(item.type, item.name)
                             : item.type === 2
-                            ? showFace(item.type)
-                            : item.type === 4
-                            ? showWork(item.type)
-                            : null
-                        "
-                      >
+                              ? showFace(item.type)
+                              : item.type === 4
+                                ? showWork(item.type)
+                                : null
+                      ">
                         管理
                       </div>
                     </div>
@@ -557,36 +451,18 @@
             <div class="pad"></div>
             <div class="xin" style="overflow-x: auto">
               <div class="xhead">
-                <a-input
-                  v-model:value="gatenamee"
-                  style="width: 270px; height: 40px; border-radius: 8px"
-                  placeholder="关卡名称"
-                />
+                <a-input v-model:value="gatenamee" style="width: 270px; height: 40px; border-radius: 8px"
+                  placeholder="关卡名称" />
                 <div class="btns" @click="searchLevel">
                   <div class="btn btn1">
                     <div class="search"></div>
-                    <a-button
-                      class="btnText"
-                      style="
-                        border: none;
-                        background: none;
-                        transform: translateY(-20%);
-                      "
-                      >搜索</a-button
-                    >
+                    <a-button class="btnText" style="border:none;background:none;transform: translateY(-20%);">搜索
+                    </a-button>
                   </div>
                   <div class="btn btn2" @click="resetLevel">
                     <div class="search"></div>
-                    <a-button
-                      style="
-                        border: none;
-                        background: none;
-                        transform: translateY(-20%);
-                        width: 100%;
-                      "
-                      class="btnText"
-                      >重置</a-button
-                    >
+                    <a-button style="border:none;background:none; transform: translateY(-20%);width:100%;"
+                      class="btnText">重置</a-button>
                   </div>
                 </div>
               </div>
@@ -594,12 +470,8 @@
                 <button class="addx" @click="showAddStu">添加学员</button>
                 <button class="addd" @click="showImpStu">导入学员</button>
                 <div class="select">
-                  <a-select
-                    style="width: 130px"
-                    value="更多操作"
-                    @change="handleStuChange"
-                    :options="projectNameList"
-                  ></a-select>
+                  <a-select style="width: 130px" value="更多操作" @change="handleStuChange" :options="projectNameList">
+                  </a-select>
                 </div>
               </div>
               <div class="talk">
@@ -616,34 +488,18 @@
                 </div>
               </div>
               <div class="tableBox" style="margin-top: 30px">
-                <a-table
-                  style="border: 1px solid #f2f6fe"
-                  :columns="tableDataFunc()"
-                  :scroll="{ x: 1500, y: 235 }"
-                  :data-source="tableData"
-                  :loading="tableDataTotal === -1 ? true : false"
-                  expandRowByClick="true"
-                  @expand="expandTable"
-                  :pagination="false"
-                  :row-selection="{
+                <a-table style="border: 1px solid #f2f6fe" :columns="tableDataFunc()" :scroll="{ x: 1500, y: 235 }"
+                  :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
-                    showSizeChanger="true"
-                    showQuickJumper="true"
-                    hideOnSinglePage="true"
-                    :pageSize="pageSize"
-                    :current="currentPage"
-                    :total="tableDataTotal"
-                    @change="pageChange"
-                    class="pagination"
-                    style="display: block"
-                  />
+                  <a-pagination showSizeChanger="true" showQuickJumper="true" hideOnSinglePage="true"
+                    :pageSize="pageSize" :current="currentPage" :total="tableDataTotal" @change="pageChange"
+                    class="pagination" style="display: block" />
                 </div>
               </div>
             </div>
@@ -672,64 +528,32 @@
                     </div>
                     <div class="onemain clearfix">
                       <div class="checkcon">
-                        <input
-                          type="checkbox"
-                          name="cb1"
-                          value="yulan"
-                          class="in"
-                        />
+                        <input type="checkbox" name="cb1" value="yulan" class="in" />
                         <span class="yulan">预览其他关卡</span><br />
                         <div style="width: 10px; height: 4px"></div>
                         <div style="display: flex; align-items: center">
                           <span class="yulan2">学员可预览第</span>
                           <span style="color: #4ea6ff" v-show="number">1</span>
-                          <a-input-number
-                            v-model:value="nubvalue"
-                            v-show="inputbox"
-                            :controls="false"
-                            :autofocus="true"
-                            :min="1"
-                          />
-                          <span>关-第</span
-                          ><span style="color: #4ea6ff" v-show="number">4</span>
-                          <a-input-number
-                            v-model:value="nubvalue1"
-                            v-show="inputbox"
-                            :controls="false"
-                            :autofocus="true"
-                            :min="1"
-                          />
+                          <a-input-number v-model:value="nubvalue" v-show="inputbox" :controls="false" :autofocus="true"
+                            :min="1" />
+                          <span>关-第</span><span style="color: #4ea6ff" v-show="number">4</span>
+                          <a-input-number v-model:value="nubvalue1" v-show="inputbox" :controls="false"
+                            :autofocus="true" :min="1" />
                           <span>关内容</span>
                         </div>
                       </div>
                       <div class="checkcon" style="margin-top: 20px">
-                        <input
-                          type="checkbox"
-                          name="cb1"
-                          value="xuexi"
-                          class="in"
-                        />
+                        <input type="checkbox" name="cb1" value="xuexi" class="in" />
                         <span class="yulan">学习其他关卡</span><br />
                         <div style="width: 10px; height: 4px"></div>
                         <div style="display: flex; align-items: center">
                           <span class="yulan2">学员可预览第</span>
                           <span style="color: #4ea6ff" v-show="number">1</span>
-                          <a-input-number
-                            v-model:value="nubvalue2"
-                            v-show="inputbox"
-                            :controls="false"
-                            :autofocus="true"
-                            :min="1"
-                          />
-                          <span>关-第</span
-                          ><span style="color: #4ea6ff" v-show="number">4</span>
-                          <a-input-number
-                            v-model:value="nubvalue3"
-                            v-show="inputbox"
-                            :controls="false"
-                            :autofocus="true"
-                            :min="1"
-                          />
+                          <a-input-number v-model:value="nubvalue2" v-show="inputbox" :controls="false"
+                            :autofocus="true" :min="1" />
+                          <span>关-第</span><span style="color: #4ea6ff" v-show="number">4</span>
+                          <a-input-number v-model:value="nubvalue3" v-show="inputbox" :controls="false"
+                            :autofocus="true" :min="1" />
                           <span>关内容</span>
                         </div>
                       </div>
@@ -753,46 +577,26 @@
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
-                      <a-upload
-                        v-model:file-list="fileList"
-                        name="file"
-                        action="/api/file/upload"
-                        @change="handleChange"
-                      >
-                        <span
-                          class="xkbtn"
-                          style="cursor: pointer; font-size: 17px"
-                          >上传</span
-                        >
-                        <img
-                          src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 34px; height: 34px"
-                          alt=""
-                        />
+                      <a-upload v-model:file-list="fileList" name="file" action="/api/file/upload"
+                        @change="handleChange">
+                        <span class="xkbtn" style="cursor: pointer; font-size: 17px">上传</span>
+                        <img src="@/assets/images/basicinfo/cloud.png"
+                          style="cursor: pointer; width: 34px; height: 34px" alt="" />
                       </a-upload>
                       <div class="btnbox" style="margin: 20px">
                         <span style="color: #999999">
                           支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
                         </span>
                       </div>
-                      <div
-                        v-for="item in docList"
-                        :key="item.src"
-                        style="margin-top: 20px"
-                        class="docListStyle"
-                      >
-                        <img
-                          src="@/assets/images/doc.png"
-                          style="
+                      <div v-for="item in docList" :key="item.src" style="margin-top: 20px;" class="docListStyle">
+                        <img src="@/assets/images/doc.png" style="
                             cursor: pointer;
                             width: 30px;
                             height: 25px;
                             margin-right: 10px;
-                          "
-                          alt=""
-                        />
+                          " alt="" />
                         <span style="font: oblique bolder 16px 宋体">{{
-                          item.name
+                            item.name
                         }}</span>
                         <span style="color: #4ea6ff; float: right">删除</span>
                       </div>
@@ -804,14 +608,8 @@
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
-      <a-modal
-        style="padding: 0"
-        :closable="sh"
-        v-model:visible="visiblene"
-        :footer="null"
-        centered="true"
-        wrapClassName="changeModal"
-      >
+      <a-modal style="padding: 0" :closable="sh" v-model:visible="visiblene" :footer="null" centered="true"
+        wrapClassName="changeModal">
         <div class="con">
           <div class="header">
             <div class="inhe">
@@ -824,15 +622,8 @@
             <div class="inher">
               <div class="cur">当前关卡：关卡2</div>
               <div class="select">
-                <a-select
-                  v-model:value="curLevel"
-                  style="width: 100%"
-                  placeholder="请选择关卡"
-                  :options="projectNameList4"
-                  @change="selectProjectName4"
-                  allowClear
-                  showSearch
-                ></a-select>
+                <a-select v-model:value="curLevel" style="width: 100%" placeholder="请选择关卡" :options="projectNameList4"
+                  @change="selectProjectName4" allowClear showSearch></a-select>
               </div>
               <div class="btn">
                 <button class="sameb btn1">取消</button>
@@ -840,24 +631,15 @@
               </div>
             </div>
           </div>
-        </div></a-modal
-      >
+        </div>
+      </a-modal>
 
       <!-- 查看学员 传入查看学员的id-->
-      <see-stu
-        v-model:Seevisible="Seevisible"
-        v-model:checkStuId="checkStuId"
-        v-model:projectId="projectId"
-      />
+      <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId" />
 
       <!-- 批量删除学员弹窗 -->
-      <a-modal
-        v-model:visible="deleteAll"
-        :footer="null"
-        :closable="closeDeleteAll"
-        wrapClassName="CopyModal"
-        centered="true"
-      >
+      <a-modal v-model:visible="deleteAll" :footer="null" :closable="closeDeleteAll" wrapClassName="CopyModal"
+        centered="true">
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -881,13 +663,8 @@
         </div>
       </a-modal>
       <!-- 面授管理二维码 -->
-      <a-modal
-        v-model:visible="copyModal"
-        :footer="null"
-        :closable="closeCopy"
-        wrapClassName="facemanageModal"
-        centered="true"
-      >
+      <a-modal v-model:visible="copyModal" :footer="null" :closable="closeCopy" wrapClassName="facemanageModal"
+        centered="true">
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -909,13 +686,8 @@
         </div>
       </a-modal>
       <!-- 直播管理二维码 -->
-      <a-modal
-        v-model:visible="zhibModal"
-        :footer="null"
-        :closable="closeCopy"
-        wrapClassName="facemanageModal"
-        centered="true"
-      >
+      <a-modal v-model:visible="zhibModal" :footer="null" :closable="closeCopy" wrapClassName="facemanageModal"
+        centered="true">
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -937,13 +709,8 @@
         </div>
       </a-modal>
       <!-- 活动管理二维码 -->
-      <a-modal
-        v-model:visible="huodModal"
-        :footer="null"
-        :closable="closeCopy"
-        wrapClassName="facemanageModal"
-        centered="true"
-      >
+      <a-modal v-model:visible="huodModal" :footer="null" :closable="closeCopy" wrapClassName="facemanageModal"
+        centered="true">
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -969,17 +736,11 @@
       <!-- 导入学员抽屉 -->
       <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
       <!-- 学员管理查看抽屉 -->
-      <check-stu
-        v-model:CheckStuvisible="CheckStuvisible"
-        v-model:studentId="studentId"
-      />
+      <check-stu v-model:CheckStuvisible="CheckStuvisible" v-model:studentId="studentId" />
       <!-- 面授学员抽屉 -->
       <face-stu v-model:FSvisible="FSvisible" />
       <!-- 活动考勤抽屉 -->
-      <active-attendance
-        v-model:AAvisible="AAvisible"
-        :title="showKaoqinText"
-      />
+      <active-attendance v-model:AAvisible="AAvisible" :title="showKaoqinText" />
       <!-- 时间管理抽屉 -->
       <time-manage v-model:Tvisible="visible" :title="showTimeText" />
       <!-- 考试管理抽屉 -->
@@ -994,40 +755,21 @@
       <a-spin :spinning="addLoading" tip="添加中..." />
     </div>
     <!-- 发布弹窗 -->
-    <a-modal
-      v-model:visible="pub"
-      :title="null"
-      :footer="null"
-      :closable="false"
-      wrapClassName="pub"
-      width="679px"
-      height="437px"
-    >
-      <div
-        class="modalHeader"
-        style="
+    <a-modal v-model:visible="pub" :title="null" :footer="null" :closable="false" wrapClassName="pub" width="679px"
+      height="437px">
+      <div class="modalHeader" style="
           width: 100%;
           height: 68px;
           display: flex;
           align-items: center;
           justify-content: space-between;
-        "
-      >
+        ">
         <div class="headerLeft" style="margin-left: 32px">
-          <span style="width: 15px; height: 15px"
-            ><img src="../../assets/images/taskpage/pub.png"
-          /></span>
-          <span
-            class="headerLeftText"
-            style="font-size: 16px; margin-left: 10px"
-            >路径发布</span
-          >
+          <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
+          <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">路径发布</span>
         </div>
         <div style="cursor: pointer; margin-right: 32px" @click="closePub">
-          <img
-            style="width: 22px; height: 22px"
-            src="../../assets/images/basicinfo/close22.png"
-          />
+          <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
         </div>
       </div>
       <div class="modalMain">
@@ -1065,13 +807,7 @@
       </div>
     </a-modal>
     <!-- 撤回路径弹窗 -->
-    <a-modal
-      v-model:visible="backModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
-    >
+    <a-modal v-model:visible="backModal" :footer="null" :closable="closeBack" wrapClassName="CopyModal" centered="true">
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1096,13 +832,8 @@
       </div>
     </a-modal>
     <!-- 复制路径弹窗 -->
-    <a-modal
-      v-model:visible="dcopyModal"
-      :footer="null"
-      :closable="dcloseCopy"
-      wrapClassName="CopyModal"
-      centered="true"
-    >
+    <a-modal v-model:visible="dcopyModal" :footer="null" :closable="dcloseCopy" wrapClassName="CopyModal"
+      centered="true">
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1126,13 +857,8 @@
       </div>
     </a-modal>
     <!-- 结束路径弹窗 -->
-    <a-modal
-      v-model:visible="stopModal"
-      :footer="null"
-      :closable="dicloseStop"
-      wrapClassName="CopyModal"
-      centered="true"
-    >
+    <a-modal v-model:visible="stopModal" :footer="null" :closable="dicloseStop" wrapClassName="CopyModal"
+      centered="true">
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1196,7 +922,7 @@ export default {
     TestManage,
     FaceManage,
     WorkManage,
-    SeeStu,
+    SeeStu
   },
   setup() {
     // const routers = useRoute();
@@ -1237,17 +963,17 @@ export default {
       picUrl: null,
       projectNameList: [
         {
-          value: "1",
-          label: "导出信息",
+          value: '1',
+          label: '导出信息',
         },
         {
-          value: "2",
-          label: "批量调整关卡",
+          value: '2',
+          label: '批量调整关卡',
         },
         {
-          value: "3",
-          label: "批量删除",
-        },
+          value: '3',
+          label: '批量删除',
+        }
       ],
       // 共享文档列表
       docList: [
@@ -1581,7 +1307,7 @@ export default {
     const stageChange = (name, id) => {
       state.choosedStageId = id;
       state.stateName = name;
-    };
+    }
     const changeTabs = (e) => {
       console.log("切换tabs", e, state.routerId);
       if (e == 2) {
@@ -1771,6 +1497,7 @@ export default {
         .catch((err) => {
           console.log("复制失败", err);
         });
+
     };
     const showStop = () => {
       state.stopModal = true;
@@ -1812,10 +1539,10 @@ export default {
           state.action == 0
             ? "发布"
             : state.action == 1
-            ? "撤回"
-            : state.action == -1
-            ? ""
-            : "-";
+              ? "撤回"
+              : state.action == -1
+                ? ""
+                : "-";
       });
     };
     // 获取项目概览
@@ -1862,13 +1589,11 @@ export default {
           //   }
           levelList.stageList = [];
           for (let i in data) {
-            if (i == 0) {
-              state.stateName = data[0].name;
-            }
+            if (i == 0) { state.stateName = data[0].name }
             levelList.stageList.push({
               stageId: Number(i) + 1,
-              name: data[i].name,
-            });
+              name: data[i].name
+            })
           }
         })
         .catch((err) => {
@@ -1901,7 +1626,7 @@ export default {
             .delStudent({ routerId: 100, studentIds: [id] })
             .then((res) => {
               message.success("删除成功");
-              getStudent();
+              getStudent()
               console.log(res);
             })
             .catch((err) => {
@@ -1912,74 +1637,62 @@ export default {
       });
     };
     const searchLevel = () => {
-      const result = state.tableData.filter(
-        (item) => item.cur == state.gatenamee
-      );
+      const result = state.tableData.filter(item => item.cur == state.gatenamee)
       state.tableData = result;
     };
     const resetLevel = () => {
-      state.gatenamee = "";
+      state.gatenamee = '';
       getStudent();
     };
     const handleStuChange = (value) => {
       console.log(value);
-      if (value == 2) {
-        state.visiblene = true;
-      }
-      if (value == 3) {
-        deleteStu();
-      }
+      if (value == 2) { state.visiblene = true }
+      if (value == 3) { deleteStu() }
     };
     const deleteStu = () => {
       if (state.selectedRowKeys.length == 0) {
         message.warning("请选择成员");
-        return;
+        return
       }
       let obj = {
         routerId: 100,
         studentIds: state.selectedRowKeys,
-      };
-      api
-        .delStudent(obj)
-        .then((res) => {
-          console.log(res);
-          getStudent();
-          message.success("批量删除成功");
-        })
-        .catch((err) => {
-          message.error("批量删除失败" + err);
-          console.log(err);
-        });
+      }
+      api.delStudent(obj).then((res) => {
+        console.log(res);
+        getStudent();
+        message.success("批量删除成功")
+      }).catch(err => {
+        message.error("批量删除失败" + err);
+        console.log(err)
+      })
     };
     const pageChange = (value) => {
       state.currentPage = value;
       getStudent();
-    };
+    }
     const setconfig = () => {
       let obj = {
-        autoJoinFlag: 0,
-        deptBoList: [
+        "autoJoinFlag": 0,
+        "deptBoList": [
           {
-            deptId: 0,
-            deptName: "",
-          },
+            "deptId": 0,
+            "deptName": ""
+          }
         ],
-        preLearnFlag: 0,
-        previewFlag: 0,
-        routerId: 0,
-        showFlag: 0,
-      };
-      api
-        .setConfig(obj)
-        .then((res) => {
-          message.success("编辑成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          console.log(err);
-          message.error("编辑失败");
-        });
-    };
+        "preLearnFlag": 0,
+        "previewFlag": 0,
+        "routerId": 0,
+        "showFlag": 0
+      }
+      api.setConfig(obj).then((res) => {
+        message.success("编辑成功")
+        console.log(res);
+      }).catch(err => {
+        console.log(err);
+        message.error("编辑失败")
+      })
+    }
     return {
       ...toRefs(state),
       ...toRefs(levelList),
@@ -2038,12 +1751,12 @@ export default {
   .ant-modal {
     .ant-modal-body {
       padding: 0;
+
       .modalHeader {
-        background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
-        );
+        background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+            rgba(78, 166, 255, 0) 100%);
       }
+
       .modalMain {
         .projectname {
           color: rgba(79, 81, 86, 1);
@@ -2052,33 +1765,37 @@ export default {
           margin-left: 62px;
           font-weight: 500;
         }
+
         .projecttime {
           margin-left: 221px;
+
           .timeti {
             color: rgba(153, 155, 163, 1);
             font-size: 14px;
             line-height: 36px;
           }
+
           .timeme {
             color: rgba(79, 81, 86, 1);
             font-size: 14px;
             line-height: 36px;
           }
         }
+
         .projectbox {
           margin-top: 26px;
           display: flex;
           justify-content: center;
+
           .promessage {
             width: 280px;
             height: 110px;
-            background: linear-gradient(
-              180deg,
-              rgba(254, 243, 221, 1),
-              rgba(255, 250, 240, 1)
-            );
+            background: linear-gradient(180deg,
+                rgba(254, 243, 221, 1),
+                rgba(255, 250, 240, 1));
             border-radius: 10px;
             margin-right: 7px;
+
             .messageme {
               color: rgba(255, 182, 78, 1);
               font-size: 14px;
@@ -2086,21 +1803,22 @@ export default {
               margin-top: 17px;
               margin-left: 30px;
             }
+
             .messagege {
               color: rgba(153, 155, 163, 1);
               font-size: 14px;
               margin-left: 30px;
             }
           }
+
           .stumessage {
             width: 280px;
             height: 110px;
-            background: linear-gradient(
-              180deg,
-              rgba(221, 234, 255, 1),
-              rgba(240, 248, 254, 1)
-            );
+            background: linear-gradient(180deg,
+                rgba(221, 234, 255, 1),
+                rgba(240, 248, 254, 1));
             border-radius: 10px;
+
             .messageme1 {
               color: rgba(78, 166, 255, 1);
               font-size: 14px;
@@ -2108,6 +1826,7 @@ export default {
               margin-top: 17px;
               margin-left: 30px;
             }
+
             .messagege1 {
               color: rgba(153, 155, 163, 1);
               font-size: 14px;
@@ -2115,30 +1834,37 @@ export default {
             }
           }
         }
+
         .send {
           margin-top: 30px;
           margin-left: 61px;
+
           .sendtext {
             margin-left: 11px;
             color: rgba(109, 117, 132, 1);
             font-size: 14px;
           }
         }
+
         .ckb {
           margin-top: 20px;
           margin-left: 62px;
+
           .sendpeo {
             color: rgba(109, 117, 132, 1);
             font-size: 14px;
           }
+
           .ant-checkbox-inner {
             border-radius: 4px;
           }
         }
+
         .pubtn {
           display: flex;
           justify-content: center;
           margin-top: 25px;
+
           //margin-bottom: 29px;
           .pubtn1 {
             width: 100px;
@@ -2153,6 +1879,7 @@ export default {
             align-items: center;
             background: rgba(255, 255, 255, 1);
           }
+
           .pubtn2 {
             width: 100px;
             height: 40px;
@@ -2170,23 +1897,28 @@ export default {
     }
   }
 }
+
 .clearfix:before,
 .clearfix:after {
   content: " ";
   display: block;
   clear: both;
 }
+
 .CopyModal {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 424px;
@@ -2194,6 +1926,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -2202,20 +1935,21 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 40px;
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
+            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;
@@ -2223,6 +1957,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -2233,6 +1968,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -2242,6 +1978,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -2250,15 +1987,18 @@ export default {
                 color: #666666;
               }
             }
+
             .docListStyle {
               display: flex;
               width: 300px !important;
               justify-content: space-around;
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -2270,17 +2010,20 @@ export default {
 
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -2292,17 +2035,21 @@ export default {
     }
   }
 }
+
 .facemanageModal {
   .ant-modal {
     width: 532px !important;
     height: 428px !important;
+
     .ant-modal-content {
       width: 532px !important;
       height: 428px !important;
+
       .ant-modal-body {
         width: 532px !important;
         height: 428px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 532px;
@@ -2310,6 +2057,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -2318,20 +2066,21 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 68px;
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
+            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;
@@ -2339,6 +2088,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -2349,6 +2099,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -2358,6 +2109,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -2366,14 +2118,17 @@ export default {
                 color: #666666;
               }
             }
+
             .footerr {
               display: flex;
               justify-content: center;
               align-items: center;
+
               .onload {
                 color: rgba(51, 51, 51, 1);
                 font-size: 14px;
               }
+
               .onloadpx {
                 width: 80px;
                 height: 32px;
@@ -2393,17 +2148,21 @@ export default {
     }
   }
 }
+
 .changeModal {
   .ant-modal {
     width: 549px !important;
     height: 245px !important;
+
     .ant-modal-content {
       width: 549px !important;
       height: 245px !important;
+
       .ant-modal-body {
         padding: 0 !important;
         width: 549px !important;
         height: 245px !important;
+
         .con {
           // background-color: #bfa;
           width: 100%;
@@ -2416,16 +2175,16 @@ export default {
             position: relative;
             justify-content: center;
 
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
+            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%);
+
             .inhe {
               width: 80%;
               height: 100%;
               display: flex;
               justify-content: space-between;
               align-items: center;
+
               .mod {
                 left: 30px;
                 top: 27px;
@@ -2434,11 +2193,13 @@ export default {
                 height: 17px;
                 background-image: url(../../assets/images/leveladd/mod.png);
               }
+
               .tz {
                 color: #000000;
                 font-weight: 400;
                 font-size: 16px;
               }
+
               .mg {
                 width: 20px;
                 height: 20px;
@@ -2448,26 +2209,32 @@ export default {
               }
             }
           }
+
           .mid {
             width: 100%;
             display: flex;
             height: 100%;
             justify-content: center;
+
             .inher {
               width: 80%;
               height: 100%;
+
               .cur {
                 color: #6f6f6f;
                 font-size: 14px;
               }
+
               .select {
                 margin-top: 10px;
               }
+
               .btn {
                 width: 100%;
                 display: flex;
                 justify-content: center;
                 margin-top: 30px;
+
                 .sameb {
                   width: 100px;
                   height: 40px;
@@ -2475,11 +2242,13 @@ export default {
 
                   border-radius: 8px;
                 }
+
                 .btn1 {
                   color: #4ea6ff;
                   background: #ffffff;
                   border: 1px solid #4ea6ff;
                 }
+
                 .btn2 {
                   margin-left: 16px;
                   border: 0;
@@ -2498,6 +2267,7 @@ export default {
 .addwrapper {
   width: 100%;
   height: 100%;
+
   .addhead {
     width: 100%;
     height: 130px;
@@ -2505,34 +2275,41 @@ export default {
     display: flex;
     align-items: center;
     position: relative;
+
     .leftimg {
       width: 151px;
       height: 100px;
       border: 10px solid #e7f2ff;
       border-radius: 8px;
       margin-left: 20px;
+
       .img {
         width: 100%;
         height: 100%;
       }
     }
+
     .imgfor {
       margin-left: 32px;
+
       .forz {
         color: #363636;
         font-size: 16px;
       }
+
       .fort {
         color: #878b92;
         font-size: 14px;
         margin-top: 20px;
       }
     }
+
     @media screen and (max-width: 1030px) {
       .imgfor {
         margin-left: 20px;
       }
     }
+
     .right {
       // width: 500px;
       height: 100%;
@@ -2541,22 +2318,26 @@ export default {
       right: 0;
       display: flex;
       align-items: center;
+
       .img1 {
         width: 24px;
         height: 24px;
         margin-right: 50px;
       }
+
       .line {
         height: 65%;
         width: 1px;
         background-color: #e8effa;
         margin-right: 28px;
       }
+
       .img2 {
         width: 42px;
         height: 42px;
         margin-right: 22px;
       }
+
       .pub {
         color: #ffb64e;
         font-size: 14px;
@@ -2564,18 +2345,21 @@ export default {
         margin-right: 30px;
         cursor: pointer;
       }
+
       .return {
         color: #4ea6ff;
         font-size: 14px;
         margin-top: 10px;
         margin-right: 60px;
       }
+
       .more {
         position: relative;
         margin-right: 30px;
         height: 30px;
         display: flex;
         align-items: center;
+
         .moreArrow {
           width: 13px;
           height: 7px;
@@ -2585,6 +2369,7 @@ export default {
           margin: 2px;
           margin-left: 15px;
         }
+
         .moreItems {
           width: 110px;
           // height: 80px;
@@ -2599,62 +2384,77 @@ export default {
           top: 30px;
           z-index: 100;
           cursor: pointer;
+
           .sammo {
             text-align: center;
             margin-top: 12px;
             cursor: pointer;
           }
+
           .sammo:hover {
             color: #4ea6ff;
           }
         }
+
         .moreItems:hover {
           display: block;
         }
       }
+
       @media screen and (max-width: 1240px) {
         .line {
           margin-right: 10px;
         }
+
         .img1 {
           margin-right: 15px;
         }
+
         .img2 {
           margin-right: 10px;
         }
+
         .return {
           margin-right: 10px;
         }
+
         .pub {
           margin-right: 10px;
         }
+
         .more {
           margin-right: 10px;
         }
       }
+
       .more:hover .moreArrow {
         background-image: url("../../assets/images/navtop/up.png");
       }
+
       .more:hover .moreItems {
         display: block;
       }
     }
   }
+
   .split {
     width: 100%;
     height: 20px;
     background-color: #edf0f5;
   }
+
   .bom {
     .tab {
       margin-top: 10px;
       // margin-left: 10px;
     }
-    .ant-tabs > .ant-tabs-nav,
-    .ant-tabs > div > .ant-tabs-nav {
+
+    .ant-tabs>.ant-tabs-nav,
+    .ant-tabs>div>.ant-tabs-nav {
       margin-left: 0px !important;
       padding-left: 32px !important;
     }
+
     .onerow {
       //width: 100%;
       display: flex;
@@ -2662,12 +2462,14 @@ export default {
       position: relative;
       margin-top: 15px;
       margin-left: 38px;
+
       //margin-right: 38px;
       .taskmain {
         font-size: 18px;
         padding-top: 7px;
         color: #000000;
       }
+
       .btn {
         position: absolute;
         top: 0;
@@ -2680,6 +2482,7 @@ export default {
         color: #ffffff;
         cursor: pointer;
       }
+
       .editright {
         position: absolute;
         right: 38px;
@@ -2696,11 +2499,13 @@ export default {
           width: 15px;
           height: 15px;
         }
+
         .editextb {
           color: #fff;
           margin-left: 10px;
         }
       }
+
       // .edit:hover {
       //   color: #ffffff;
       //   background-color: #409eff;
@@ -2710,12 +2515,14 @@ export default {
       //   }
       // }
     }
+
     .second {
       display: flex;
       justify-content: left;
       flex-wrap: wrap;
       margin-top: 40px;
       margin-left: 20px;
+
       .nubbox {
         width: 253px;
         height: 116px;
@@ -2727,16 +2534,19 @@ export default {
         background: #fafbfc;
         border-radius: 10px;
         margin-left: 15px;
+
         .nub1 {
           color: #ffb54a;
           font-size: 30px;
           font-weight: 700;
         }
+
         .nub2 {
           color: #6d7584;
           font-size: 14px;
         }
       }
+
       .taskbox {
         width: 412px;
         height: 160px;
@@ -2745,21 +2555,25 @@ export default {
         margin-left: 68px;
         margin-bottom: 40px;
         cursor: pointer;
+
         .leftt {
           position: absolute;
           top: 18px;
           left: 0;
         }
+
         .photo {
           position: absolute;
           top: 42px;
           left: 37px;
         }
+
         .rightt {
           position: absolute;
           top: 69px;
           right: 26px;
         }
+
         .centerbox {
           position: absolute;
           top: 52px;
@@ -2768,6 +2582,7 @@ export default {
           font-weight: 700;
           //line-height: 36px;
         }
+
         .centermain {
           color: rgba(135, 139, 146, 1);
           font-size: 14px;
@@ -2777,9 +2592,11 @@ export default {
         }
       }
     }
+
     .stagemess {
       display: flex;
       margin-left: 38px;
+
       .stage1 {
         width: 100px;
         height: 33px;
@@ -2793,6 +2610,7 @@ export default {
         margin-top: 19px;
         cursor: pointer;
       }
+
       .stage2 {
         width: 100px;
         height: 33px;
@@ -2808,67 +2626,82 @@ export default {
         cursor: pointer;
       }
     }
+
     .stagesecond {
       display: flex;
       margin-left: 39px;
       margin-top: 29px;
+
       .staname {
         color: #999ba3;
         font-size: 14px;
       }
+
       .stamess {
         color: #4f5156;
         font-size: 14px;
       }
     }
+
     .stagelast {
       display: flex;
       flex-wrap: wrap;
       justify-content: center;
       margin-bottom: 55px;
+
       .stagepro {
         display: flex;
         flex-direction: column;
         align-items: center;
         margin-top: 55px;
         margin-right: 120px;
+
         .ant-progress-circle-path {
           stroke: #4ea6ff;
         }
+
         .ant-progress-text {
           color: #4ea6ff;
           font-weight: 700;
         }
+
         .protext {
           color: #6d7584;
           font-size: 14px;
           margin-top: 25px;
         }
       }
+
       .proright {
         width: 500px;
         margin-top: 55px;
         margin-left: 50px;
+
         .ant-progress-bg {
           height: 24px !important;
           background: #4ea6ff;
         }
+
         .ant-progress-inner {
           height: 24px;
         }
+
         .pronub {
           color: #4ea6ff;
           font-size: 14px;
           margin: 5px 0;
         }
+
         .proright1 {
           display: flex;
           justify-content: right;
+
           .textpro {
             color: #6d7584;
             font-size: 14px;
             margin-right: 20px;
           }
+
           .ant-progress-text {
             color: #4ea6ff;
             font-size: 14px;
@@ -2877,17 +2710,21 @@ export default {
         }
       }
     }
+
     .sametab {
       // margin-left: 30px;
       // margin-right: 30px;
       margin-top: 30px;
       width: 100%;
+
       // background-color: green;
       .Lhead {
         display: flex;
+
         .btns {
           display: flex;
           margin-left: 20px;
+
           // flex-wrap: wrap;
           .btn {
             padding: 0px 26px 0px 26px;
@@ -2901,9 +2738,11 @@ export default {
             margin-right: 14px;
             flex-shrink: 0;
             cursor: pointer;
+
             .search {
               background-size: 100%;
             }
+
             .btnText {
               font-size: 14px;
               font-weight: 400;
@@ -2912,6 +2751,7 @@ export default {
               margin-left: 5px;
             }
           }
+
           .btn1 {
             .search {
               width: 15px;
@@ -2919,6 +2759,7 @@ export default {
               background-image: url("../../assets/images/courseManage/search1.png");
             }
           }
+
           .btn2 {
             .search {
               width: 16px;
@@ -2926,46 +2767,59 @@ export default {
               background-image: url("../../assets/images/courseManage/reset1.png");
             }
           }
+
           .btn3 {
             margin-right: 0px;
+
             .search {
               width: 17px;
               height: 18px;
               background-image: url("../../assets/images/courseManage/add1.png");
             }
           }
+
           .btn1:hover {
             background: rgba(64, 158, 255, 1);
+
             .search {
               background-image: url("../../assets/images/courseManage/search0.png");
             }
+
             .btnText {
               color: #ffffff;
             }
           }
+
           .btn2:hover {
             background: rgba(64, 158, 255, 1);
+
             .search {
               background-image: url("../../assets/images/courseManage/reset0.png");
             }
+
             .btnText {
               color: #ffffff;
             }
           }
+
           .btn3:hover {
             background: rgba(64, 158, 255, 1);
+
             .search {
               background-image: url("../../assets/images/courseManage/add0.png");
             }
+
             .btnText {
               color: #ffffff;
             }
           }
         }
       }
+
       .Lbom {
         position: relative;
         margin-bottom: 20px;
+
         .item {
           width: 100%;
           height: 200px;
@@ -2973,6 +2827,7 @@ export default {
           margin-top: 40px;
           border-radius: 8px;
           border: 1px solid #f0f4fe;
+
           .itemhead {
             height: 50px;
             width: 100%;
@@ -2980,6 +2835,7 @@ export default {
             display: flex;
             align-items: center;
             position: relative;
+
             .lev {
               margin-left: 27px;
               margin-right: 16px;
@@ -2987,64 +2843,77 @@ export default {
               color: #409eff;
               font-size: 16px;
             }
+
             .lin {
               width: 1px;
               height: 35%;
               background-color: #c7cbd2;
             }
+
             .nam {
               margin-left: 16px;
               color: #4f5156;
               line-height: 100%;
               font-size: 16px;
             }
+
             .count {
               position: absolute;
               line-height: 100%;
               color: #4f5156;
               font-size: 14px;
               right: 40px;
+
               span:nth-child(2) {
                 color: #63ca8c;
               }
             }
           }
+
           .itembomm {
             display: flex;
             align-items: center;
             height: 150px;
+
             .it {
               // margin-left: 110px;
               // margin-right: 110px;
               width: 13%;
               text-align: center;
+
               .on {
                 font-size: 30px;
               }
+
               .ittext {
                 color: #4f5156;
                 margin-top: 16px;
                 margin-left: -5px;
               }
             }
+
             .linee {
               background-color: #ecf2fb;
               width: 1px;
               height: 55%;
             }
+
             .itright {
               position: absolute;
               right: 45px;
               display: flex;
+
               .te {
                 color: #4ea6ff;
                 font-size: 14px;
                 cursor: pointer;
               }
+
               .more {
                 position: relative;
                 height: 30px;
                 display: flex;
+
                 .moreArrow {
                   width: 13px;
                   height: 7px;
@@ -3055,6 +2924,7 @@ export default {
                   margin-left: 7px;
                   margin-top: 6px;
                 }
+
                 .moreItems {
                   width: 80px;
                   height: 70px;
@@ -3067,6 +2937,7 @@ export default {
                   left: 0px;
                   top: 20px;
                   z-index: 100;
+
                   .roleItem {
                     font-size: 14px;
                     font-weight: 400;
@@ -3076,14 +2947,17 @@ export default {
                     justify-content: center;
                     cursor: pointer;
                   }
+
                   .roleItem:hover {
                     color: #4ea6ff;
                   }
                 }
               }
+
               .more:hover .moreArrow {
                 background-image: url("../../assets/images/navtop/up.png");
               }
+
               .more:hover .moreItems {
                 display: block;
               }
@@ -3093,12 +2967,15 @@ export default {
           .show {
             color: blue;
           }
+
           .noshow {
             display: none;
           }
         }
+
         .create {
           margin-top: 40px;
+
           .taskbox {
             width: 412px;
             height: 160px;
@@ -3107,21 +2984,25 @@ export default {
             // margin-left: 68px;
             margin-bottom: 40px;
             cursor: pointer;
+
             .leftt {
               position: absolute;
               top: 18px;
               left: 0;
             }
+
             .photo {
               position: absolute;
               top: 42px;
               left: 37px;
             }
+
             .rightt {
               position: absolute;
               top: 69px;
               right: 26px;
             }
+
             .centerbox {
               position: absolute;
               top: 52px;
@@ -3130,6 +3011,7 @@ export default {
               font-weight: 700;
               //line-height: 36px;
             }
+
             .centermain {
               color: rgba(135, 139, 146, 1);
               font-size: 14px;
@@ -3141,6 +3023,7 @@ export default {
         }
       }
     }
+
     .cont {
       display: flex;
 
@@ -3158,12 +3041,14 @@ export default {
       position: relative;
       margin-top: 15px;
       margin-left: 38px;
+
       //margin-right: 38px;
       .taskmain {
         font-size: 18px;
         padding-top: 7px;
         color: #000000;
       }
+
       .btn {
         position: absolute;
         top: 0;
@@ -3176,6 +3061,7 @@ export default {
         color: #ffffff;
         cursor: pointer;
       }
+
       .edit {
         position: absolute;
         right: 38px;
@@ -3185,6 +3071,7 @@ export default {
         height: 40px;
         border: 1px solid #409eff;
         border-radius: 8px;
+
         .editimg {
           width: 15px;
           height: 15px;
@@ -3192,19 +3079,23 @@ export default {
           margin-left: 25px;
           margin-right: 5px;
         }
+
         .editext {
           line-height: 40px;
         }
       }
+
       .edit:hover {
         color: #ffffff;
         background-color: #409eff;
         cursor: pointer;
+
         .editimg {
           background-image: url("../../assets/images/projectadd/edit1.png");
         }
       }
     }
+
     .taskbox {
       width: 412px;
       height: 160px;
@@ -3214,21 +3105,25 @@ export default {
       margin-bottom: 10px;
       margin-top: 10px;
       cursor: pointer;
+
       .leftt {
         position: absolute;
         top: 18px;
         left: 0;
       }
+
       .photo {
         position: absolute;
         top: 42px;
         left: 37px;
       }
+
       .rightt {
         position: absolute;
         top: 69px;
         right: 26px;
       }
+
       .centerbox {
         position: absolute;
         top: 52px;
@@ -3237,6 +3132,7 @@ export default {
         font-weight: 700;
         //line-height: 36px;
       }
+
       .centermain {
         color: rgba(135, 139, 146, 1);
         font-size: 14px;
@@ -3245,6 +3141,7 @@ export default {
         bottom: 49px;
       }
     }
+
     .taskSyllabus {
       // flex: 1;
       overflow-x: auto;
@@ -3255,13 +3152,15 @@ export default {
         min-width: 1040px;
       }
 
-      .ant-collapse-content > .ant-collapse-content-box {
+      .ant-collapse-content>.ant-collapse-content-box {
         padding-top: 0px;
         padding-bottom: 0px;
       }
-      .ant-collapse > .ant-collapse-item {
+
+      .ant-collapse>.ant-collapse-item {
         border: 0px;
       }
+
       .ant-collapse-header {
         display: flex;
         height: 49px;
@@ -3274,14 +3173,17 @@ export default {
         font-weight: 400;
         color: #409eff;
         line-height: 36px;
+
         .ant-collapse-arrow {
           margin-left: 15px !important;
         }
       }
+
       .ant-collapse-content {
         border-top: 0px;
       }
     }
+
     .course {
       //width: 100%;
       flex-shrink: 0;
@@ -3296,6 +3198,7 @@ export default {
       //margin: 0 12px;
       border: 1px solid #f2f6fc;
       border-top: 0px;
+
       .first {
         //position: relative;
         display: flex;
@@ -3311,6 +3214,7 @@ export default {
           font-size: 16px;
           margin-left: 4px;
         }
+
         .icontext {
           //positipn: absolute;
           color: #999ba3;
@@ -3319,12 +3223,14 @@ export default {
           width: 83px;
         }
       }
+
       .type {
         //height: 71px;
         display: flex;
         flex-grow: 1;
         align-items: center;
         margin-right: 50px;
+
         .typename {
           width: 63px;
           height: 23px;
@@ -3334,6 +3240,7 @@ export default {
           border-radius: 4px;
           text-align: center;
         }
+
         .typename1 {
           width: 63px;
           height: 23px;
@@ -3344,28 +3251,34 @@ export default {
           text-align: center;
         }
       }
+
       .time {
         //height: 71px;
         flex-grow: 1;
         margin-right: 50px;
+
         .timetext {
           font-size: 14px;
           color: #999ba3;
         }
       }
+
       .progress {
         width: 168px;
         margin-left: 10px;
         margin-right: 50px;
         flex-grow: 1;
+
         .progresstext {
           color: #ffc067;
           font-size: 14px;
         }
       }
+
       .operations {
         display: flex;
         width: 200px;
+
         //flex-grow: 1;
         .operation {
           color: #4ea6ff;
@@ -3384,19 +3297,24 @@ export default {
       margin-top: 30px;
       display: flex;
       margin-bottom: 20px;
+
       // overflow-x: auto;
       .pad {
         height: 100%;
         width: 40px;
         flex-shrink: 0;
       }
+
       .xin {
         width: 100%;
+
         .xhead {
           display: flex;
+
           .btns {
             display: flex;
             margin-left: 20px;
+
             // flex-wrap: wrap;
             .btn {
               padding: 0px 26px 0px 26px;
@@ -3410,9 +3328,11 @@ export default {
               margin-right: 14px;
               flex-shrink: 0;
               cursor: pointer;
+
               .search {
                 background-size: 100%;
               }
+
               .btnText {
                 font-size: 14px;
                 font-weight: 400;
@@ -3421,6 +3341,7 @@ export default {
                 margin-left: 5px;
               }
             }
+
             .btn1 {
               .search {
                 width: 15px;
@@ -3428,6 +3349,7 @@ export default {
                 background-image: url("../../assets/images/courseManage/search1.png");
               }
             }
+
             .btn2 {
               .search {
                 width: 16px;
@@ -3435,46 +3357,59 @@ export default {
                 background-image: url("../../assets/images/courseManage/reset1.png");
               }
             }
+
             .btn3 {
               margin-right: 0px;
+
               .search {
                 width: 17px;
                 height: 18px;
                 background-image: url("../../assets/images/courseManage/add1.png");
               }
             }
+
             .btn1:hover {
               background: rgba(64, 158, 255, 1);
+
               .search {
                 background-image: url("../../assets/images/courseManage/search0.png");
               }
+
               .btnText {
                 color: #ffffff;
               }
             }
+
             .btn2:hover {
               background: rgba(64, 158, 255, 1);
+
               .search {
                 background-image: url("../../assets/images/courseManage/reset0.png");
               }
+
               .btnText {
                 color: #ffffff;
               }
             }
+
             .btn3:hover {
               background: rgba(64, 158, 255, 1);
+
               .search {
                 background-image: url("../../assets/images/courseManage/add0.png");
               }
+
               .btnText {
                 color: #ffffff;
               }
             }
           }
         }
+
         .xheadb {
           display: flex;
           margin-top: 30px;
+
           .addx {
             width: 130px;
             height: 40px;
@@ -3485,6 +3420,7 @@ export default {
             cursor: pointer;
             margin-right: 20px;
           }
+
           .addd {
             width: 130px;
             height: 40px;
@@ -3495,25 +3431,30 @@ export default {
             cursor: pointer;
             margin-right: 20px;
           }
+
           .select {
             .ant-select {
               //
               // border: 0 !important;
               border-radius: 11px;
+
               .ant-select-selector {
                 border: 1px solid #4ea6ff !important;
+
                 .ant-select-selection-placeholder {
                   padding-left: 15px;
                   color: #4ea6ff;
                 }
               }
             }
+
             .ant-select-selection-item {
               padding-left: 15px;
               color: #4ea6ff;
             }
           }
         }
+
         .talk {
           margin-top: 24px;
           margin-bottom: 11px;
@@ -3524,30 +3465,36 @@ export default {
           // opacity: 0.22;
           display: flex;
           align-items: center;
+
           .im {
             width: 14px;
             height: 15px;
             margin-left: 27px;
             margin-top: -3px;
           }
+
           .xu {
             height: 100%;
             line-height: 50px;
             margin-left: 13px;
+
             .yi {
               color: #4f5156;
               font-size: 14px;
             }
+
             .zon {
               color: #999ba3;
               font-size: 14px;
               margin-left: 34px;
             }
+
             .th {
               color: #4ea6ff;
             }
           }
         }
+
         .tableBox {
           margin-bottom: 80px;
 
@@ -3555,26 +3502,29 @@ export default {
             margin-left: 11px !important;
             padding-left: 9px !important;
           }
+
           .ant-checkbox-wrapper {
             align-items: center;
             margin-top: -2px;
           }
+
           .ant-table-selection-column {
             padding: 0px !important;
             padding-left: 38px !important;
           }
-          .ant-table-thead > tr > th {
+
+          .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 {
+          .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
             background: #f6f9fd;
           }
+
           .pa {
             left: 0;
             width: 100%;
@@ -3588,37 +3538,46 @@ export default {
         }
       }
     }
+
     .Gcon {
       display: flex;
+
       .pad {
         height: 100%;
         width: 40px;
       }
+
       .Gin {
         // background-color: #bfa;
         margin-top: 30px;
+
         .headone {
           // background-color: red;
           display: flex;
           text-align: center;
+
           .box {
             width: 4px;
             height: 20px;
             background-color: #409eff;
             border-radius: 2px;
           }
+
           .onetitle {
             margin-left: 15px;
             color: #333333;
             font-size: 14px;
           }
+
           .oneedi {
             margin-left: 15px;
             color: #4ea6ff;
             cursor: pointer;
           }
+
           .twobtn {
             display: flex;
+
             .btnone {
               width: 42px;
               height: 24px;
@@ -3628,6 +3587,7 @@ export default {
               margin-left: 20px;
               cursor: pointer;
             }
+
             .btntwo {
               width: 42px;
               height: 24px;
@@ -3640,33 +3600,40 @@ export default {
             }
           }
         }
+
         .onemain {
           margin-top: 20px;
           margin-left: 55px;
           color: #6f6f6f;
           font-size: 14px;
+
           .checkcon {
             position: relative;
+
             .in {
               position: absolute;
               // margin-top: 10px;
               left: 0;
               top: 3px;
             }
+
             .yulan {
               // color: yellow;
               margin-left: 22px;
               // display: inline-block;
             }
+
             .yulan2 {
               margin-left: 22px;
             }
+
             .ant-input-number {
               height: 24px;
               width: 24px;
               margin: 10px;
               border-radius: 4px;
               border: 1px solid #6d7584;
+
               .ant-input-number-input {
                 width: 100%;
                 height: 100%;
@@ -3678,58 +3645,72 @@ export default {
             }
           }
         }
+
         .twomain {
           margin-left: 20px;
           margin-top: 20px;
+
           .ant-switch-checked {
             background-color: #5dc988;
           }
+
           .info {
             margin-left: 10px;
             color: #6f6f6f;
             font-size: 14px;
             // margin-top: 10px;
           }
+
           .infor {
             margin-left: 38px;
             margin-top: 10px;
             color: #c7cbd2;
             font-size: 14px;
           }
+
           .chooseshow {
             // background-color: red;
             margin-left: 38px;
             margin-top: 12px;
+
             .fane {
               color: #6f6f6f;
               font-size: 14px;
             }
           }
+
           .choo {
             display: none;
           }
+
           .btm {
             margin-left: 38px;
             margin-top: 20px;
+
             .bmo {
               color: #6f6f6f;
               font-size: 14px;
             }
+
             .bmt {
               color: #c7cbd2;
               font-size: 14px;
               margin-top: 3px;
             }
+
             .chosecon {
               display: flex;
               margin-top: 6px;
               margin-bottom: 20px;
+
               .chose {
                 position: relative;
+
                 .inl {
                   position: absolute;
                   top: 2px;
                 }
+
                 .sh {
                   margin-left: 23px;
                   color: #6f6f6f;

From e60e62f1e166e4b805fbd014e7621233f5ff96aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Mon, 21 Nov 2022 15:53:17 +0800
Subject: [PATCH 80/90] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=A8=A1=E6=9D=BF=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexLibrary.js                     |  10 -
 src/api/indexTemplate.js                    |   6 +-
 src/views/projectcenter/LibraryAdd.vue      | 748 +++++++++-----------
 src/views/projectcenter/TemplateLibrary.vue | 229 +++---
 4 files changed, 463 insertions(+), 530 deletions(-)
 delete mode 100644 src/api/indexLibrary.js

diff --git a/src/api/indexLibrary.js b/src/api/indexLibrary.js
deleted file mode 100644
index a5f8feb2..00000000
--- a/src/api/indexLibrary.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import http from "./config";
-
-// 获取模板库列表
-export const templateList = obj => http.post('/admin/project/template/list', obj);
-
-// 获取模板详情
-export const templateDetail = id => http.get(`/admin/project/template/detail?projectTemplateId=${id}`);
-
-// 操作模板(撤回,发布,删除) 
-export const templateHadle = obj => http.post(`/admin/project/template/handle`,obj);
\ No newline at end of file
diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js
index 713e349a..a9837852 100644
--- a/src/api/indexTemplate.js
+++ b/src/api/indexTemplate.js
@@ -14,4 +14,8 @@ export const moveTask = (obj) => http.post('/admin/project/template/moveTask',ob
 // 新建或编辑阶段
 export const editStage = (obj) => http.post('/admin/project/template/editStage',obj);
 // 新建或编辑阶段任务
-export const editTask = (obj) => http.post('/admin/project/template/editTask',obj);
\ No newline at end of file
+export const editTask = (obj) => http.post('/admin/project/template/editTask',obj);
+// 操作模板(撤回，发布，删除)
+export const handleTemplates = (obj) => http.post('/admin/project/template/handle',obj);
+// 模板库列表
+export const templateList = (obj) => http.post(`/admin/project/template/list`,obj);
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 851e7e8e..09657694 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -5,11 +5,11 @@
         <img class="img" src="../../assets/images/projectadd/picture.png" />
       </div>
       <div class="imgfor">
-        <div class="forz">管理者进阶-腾飞班1备份</div>
+        <div class="forz">{{projectInfo.name || '-'}}</div>
         <div class="fort">
-          <div class="fort1">项目经理：黄华、刘俊备份</div>
+          <div class="fort1">项目经理：{{projectInfo.manager || '-'}}</div>
           <div class="fort2">
-            起止时间：2022-09-21 00:00 至 2022-10-21 00:00
+            起止时间：{{projectInfo.beginTime || '-'}} 至 {{projectInfo.endTime || '-'}}
           </div>
         </div>
       </div>
@@ -200,7 +200,7 @@
                               : 'none',
                         }"
                       >
-                        <!-- 考勤 -->
+                      <!-- 考勤 -->
                       </div>
                       <div
                         class="operation"
@@ -278,7 +278,7 @@
             <hr color="#E8E8E8" />
             <div class="ntc_body">
               <div class="ntc_switch">
-                <a-switch v-model:checked="checked" @click="changeopclo" />
+                <a-switch v-model:checked="checked" @click="changeopclo"  />
                 <div
                   class="opclo"
                   :style="{ display: hideshow ? 'block' : 'none' }"
@@ -385,217 +385,165 @@
           <div class="split"></div>
           <a-tabs>
             <a-tab-pane key="1" tab="编辑">
-              <div class="setting">
-                <div class="set_tit">
-                  <span>基本信息</span>
-                  <span class="editBtn" @click="toEdit">编辑</span>
-                </div>
-                <hr color="#E8E8E8" />
-                <div class="set_body">
-                  <div class="set_content">
-                    <div class="setc_name"><span>模板名称：</span></div>
-                    <div class="setc_main">
-                      <a-input
-                        v-model:value="formData.name"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 300px"
-                      ></a-input>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>封面图：</span></div>
-                    <div class="setc_main">
-                      <a-upload
-                        v-model:file-list="fileList"
-                        name="file"
-                        action="/api/file/upload"
-                        @change="handleChange"
-                        :disabled="!isEdit"
-                      >
-                        <img
-                          src="@/assets/images/projectadd/picture.png"
-                          alt=""
-                        />
-                      </a-upload>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>模板时间：</span></div>
-                    <div class="setc_main">
-                      <a-range-picker
-                        v-model:value="formData.time"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                      />
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目经理：</span></div>
-                    <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.manager"
-                        mode="multiple"
-                        placeholder="请选择项目经理"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="managerOptions"
-                      ></a-select>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>资源归属：</span></div>
-                    <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.sourceBelongId"
-                        placeholder="请选择资源归属"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="sourceBelongOptions"
-                      ></a-select>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>模板说明：</span></div>
-                    <div class="setc_main">
-                      <a-input
-                        v-model:value="formData.remark"
-                        style="width: 300px"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                      ></a-input>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main" @click="changecheck2">
-                      <a-radio
-                        v-model:checked="formData.courseSyncFlag"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目级别：</span></div>
-                    <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.level"
-                        placeholder="请选择项目级别"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="levelOptions"
-                      ></a-select>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>培训分类：</span></div>
-                    <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.systemId"
-                        placeholder="请选择培训分类"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="systemOptions"
-                      ></a-select>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>是否BOEU实施：</span></div>
-                    <div class="setc_main" @click="changecheck3">
-                      <a-radio
-                        v-model:checked="formData.boeFlag"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        ><span style="color: #333333">BOEU实施</span></a-radio
-                      >
-                    </div>
-                  </div>
-                  <div v-if="isEdit" style="transform: translateX(50%)">
-                    <a-button
-                      @click="cancelEdit"
-                      style="background-color: #f9f9f9"
-                      >取消</a-button
-                    >
-                    <a-button
-                      @click="confirmEdit"
-                      style="background-color: #f5faff"
-                      >保存</a-button
-                    >
-                  </div>
+          <div class="setting">
+            <div class="set_tit">
+              <span>基本信息</span>
+              <span class="editBtn" @click="toEdit">编辑</span>
+            </div>
+            <hr color="#E8E8E8" />
+            <div class="set_body">
+              <div class="set_content">
+                <div class="setc_name"><span>模板名称：</span></div>
+                <div class="setc_main">
+                  <a-input v-model:value="formData.name"
+                  :bordered="isEdit" :disabled="!isEdit"
+                  style="width:300px;"
+                  ></a-input>
                 </div>
               </div>
+              <div class="set_content">
+                <div class="setc_name"><span>封面图：</span></div>
+                <div class="setc_main">
+                  <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                  :disabled="!isEdit"
+                >
+                <img src="@/assets/images/projectadd/picture.png" alt="" />
+                </a-upload>
+                  
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>模板时间：</span></div>
+                <div class="setc_main">
+                  <a-range-picker v-model:value="formData.time"
+                  
+                  :bordered="isEdit" :disabled="!isEdit" />
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>项目经理：</span></div>
+                <div class="setc_main">
+                  <a-select
+                    v-model:value="formData.manager" mode="multiple"
+                    placeholder="请选择项目经理"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="managerOptions"
+                  ></a-select>
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>资源归属：</span></div>
+                <div class="setc_main">
+                  <a-select
+                    v-model:value="formData.sourceBelongId"
+                    placeholder="请选择资源归属"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="sourceBelongOptions"
+                  ></a-select>
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>模板说明：</span></div>
+                <div class="setc_main">
+                  <a-input v-model:value="formData.remark"
+                  style="width:300px;"
+                  :bordered="isEdit" :disabled="!isEdit"
+                  ></a-input>
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>同步学习记录：</span></div>
+                <div class="setc_main" @click="changecheck2">
+                  <a-radio v-model:checked="formData.courseSyncFlag"
+                  :bordered="isEdit" :disabled="!isEdit"
+                    ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                    ></a-radio
+                  >
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>项目级别：</span></div>
+                <div class="setc_main">
+                  <a-select
+                    v-model:value="formData.level"
+                    placeholder="请选择项目级别"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="levelOptions"
+                  ></a-select>
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>培训分类：</span></div>
+                <div class="setc_main">
+                  <a-select
+                    v-model:value="formData.systemId"
+                    placeholder="请选择培训分类"
+                    :size="large" :bordered="isEdit" :disabled="!isEdit"
+                    style="width: 200px;color: #999999;" :options="systemOptions"
+                  ></a-select>
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>是否BOEU实施：</span></div>
+                <div class="setc_main" @click="changecheck3">
+                  <a-radio v-model:checked="formData.boeFlag"
+                  :bordered="isEdit" :disabled="!isEdit"
+                    ><span style="color: #333333">BOEU实施</span></a-radio
+                  >
+                </div>
+              </div>
+              <div  v-if="isEdit" style="transform: translateX(50%)">
+                <a-button @click="cancelEdit" style="background-color: #f9f9f9">取消</a-button>
+                <a-button  @click="confirmEdit" style="background-color: #f5faff">保存</a-button>
+            </div>
+            </div>
+          </div>
             </a-tab-pane>
             <a-tab-pane key="2" tab="共享文档">
               <div class="sametab">
-                <div class="Gcon">
-                  <div class="pad"></div>
-                  <div class="Gin">
-                    <div class="headone" style="transform: translateX(30px)">
-                      <div class="box"></div>
-                      <div class="onetitle">上传共享文档</div>
-                      <div class="oneedi">
-                        <a-switch v-model:checked="docChecked"></a-switch>
-                      </div>
-                    </div>
-                    <div class="btnbox" style="margin: 20px">
-                      <a-upload
-                        v-model:file-list="fileList"
-                        name="file"
-                        action="/api/file/upload"
-                        @change="handleChange"
-                      >
-                        <span
-                          class="xkbtn"
-                          style="cursor: pointer; font-size: 17px"
-                          >上传</span
-                        >
-                        <img
-                          src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 34px; height: 34px"
-                          alt=""
-                        />
-                      </a-upload>
-                      <div class="btnbox" style="margin: 20px">
-                        <span style="color: #999999">
-                          支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
-                        </span>
-                      </div>
-                      <div
-                        v-for="item in docList"
-                        :key="item.src"
-                        class="docListStyle"
-                      >
-                        <img
-                          src="@/assets/images/basicinfo/download.png"
-                          style="
-                            cursor: pointer;
-                            width: 40px;
-                            height: 40px;
-                            margin-right: 40px;
-                          "
-                          alt=""
-                        />
-                        <span style="font: oblique 16px Sans-serif">{{
-                          item.name
-                        }}</span>
-                        <span style="color: #4ea6ff; float: right">删除</span>
-                      </div>
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone" style="transform: translateX(30px)">
+                    <div class="box"></div>
+                    <div class="onetitle">上传共享文档</div>
+                    <div class="oneedi">
+                      <a-switch v-model:checked="docChecked" ></a-switch>
                     </div>
                   </div>
+                  <div class="btnbox" style="margin:20px;">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
+                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
+                  width:34px;height:34px;
+                  " alt="">
+                </a-upload>
+                <div class="btnbox" style="margin:20px;">
+                <span style="color: #999999">
+                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                </span>
+              </div>
+              <div v-for="item in docList" :key="item.src" class="docListStyle">
+                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
+                  width:40px;height:40px;margin-right:40px;
+                  " alt="">
+                <span style="font: oblique   16px Sans-serif">{{item.name}}</span> 
+                <span style="color: #4ea6ff;float:right;">删除</span>
+              </div>
+              </div>
                 </div>
               </div>
+            </div>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
@@ -642,9 +590,9 @@
 </template>
 
 <script>
-import { ref, reactive, defineComponent, toRefs, onMounted } from "vue";
+import { ref, reactive, defineComponent, toRefs, onMounted} from "vue";
 import { message } from "ant-design-vue";
-import * as api from "@/api/indexTemplate";
+import * as api from "@/api/indexTemplate"
 import { useRouter } from "vue-router";
 export default defineComponent({
   name: "LibraryAdd",
@@ -772,27 +720,27 @@ export default defineComponent({
         },
       ],
       // 模板编辑列表
-      managerOptions: [
-        { value: "李俊国" },
-        { value: "将小米" },
-        { value: "刘孟君" },
+      managerOptions:[
+        { value: "李俊国"},
+        { value: "将小米"},
+        { value: "刘孟君"},
       ],
-      sourceBelongOptions: [
-        { value: "项目一" },
-        { value: "项目二" },
-        { value: "项目三" },
+      sourceBelongOptions:[
+        { value: "项目一"},
+        { value: "项目二"},
+        { value: "项目三"},
       ],
-      levelOptions: [
-        { value: "集团级" },
-        { value: "组织级" },
-        { value: "现地级" },
-        { value: "部门级" },
+      levelOptions:[
+        { value: "集团级"},
+        { value: "组织级"},
+        { value: "现地级"},
+        { value: "部门级"},
       ],
-      systemOptions: [
-        { value: "集团级" },
-        { value: "组织级" },
-        { value: "现地级" },
-        { value: "部门级" },
+      systemOptions:[
+        { value: "集团级"},
+        { value: "组织级"},
+        { value: "现地级"},
+        { value: "部门级"},
       ],
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
@@ -804,7 +752,7 @@ export default defineComponent({
       checked: true,
       checked2: false,
       checked3: false,
-      docChecked: true,
+      docChecked:true,
       value3: false,
       value4: false,
       hideshow: true,
@@ -812,22 +760,22 @@ export default defineComponent({
       score2: 5,
       edit: true,
       // 共享文档列表
-      docList: [
+      docList:[
         {
-          name: "测试文档1.doc",
-          src: "",
+          name:'测试文档1.doc',
+          src:"",
         },
         {
-          name: "测试文档2.doc",
-          src: "",
+          name:'测试文档2.doc',
+          src:"",
         },
         {
-          name: "测试文档3.doc",
-          src: "",
-        },
+          name:'测试文档3.doc',
+          src:"",
+        }
       ],
       // 基本信息
-      formData: {
+      formData:{
         name: "123",
         time: "",
         manager: "建国",
@@ -838,7 +786,13 @@ export default defineComponent({
         systemId: null,
         boeFlag: false,
       },
-      isEdit: false, // 是否处于编辑状态
+      isEdit:false, // 是否处于编辑状态
+      projectInfo:{
+        beginTime:null,
+        endTime:null,
+        name: null,
+        manager: null,
+      }
     });
     const value = ref("");
     const value2 = ref("");
@@ -859,182 +813,153 @@ export default defineComponent({
     };
     const confirmEdit = () => {
       state.isEdit = false;
-      editTemplate();
+      editTemplate()
       getDetail();
     };
-    onMounted(() => {
-      getDetail();
-    });
+    onMounted(() => {getDetail()});
     // 获取详情
     const getDetail = () => {
-      api
-        .templateDetail(0)
-        .then((res) => {
-          console.log(res);
-          state.formData.name = res.data.data.projectInfo.name;
-          state.formData.time =
-            res.data.data.projectInfo.startTime +
-            res.data.data.projectInfo.endTime;
-          state.formData.manager = res.data.data.projectInfo.manager;
-          state.formData.sourceBelongId =
-            res.data.data.projectInfo.sourceBelongId;
-          state.formData.remark = res.data.data.stageList.remark;
-          state.formData.courseSyncFlag =
-            res.data.data.projectInfo.courseSyncFlag;
-          state.formData.level = res.data.data.projectInfo.level;
-          state.formData.systemId = res.data.data.projectInfo.systemId;
-          state.formData.boeFlag = res.data.data.projectInfo.boeFlag;
-          state.value2 = res.data.data.projectInfo.notice;
-        })
-        .catch((err) => {
-          message.error("操作失败" + err);
-          console.log(err);
-        });
-    };
+      api.templateDetail(1).then(res => {
+        console.log(res)
+        state.formData.name = res.data.data.projectInfo.name
+        state.formData.time = res.data.data.projectInfo.startTime+res.data.data.projectInfo.endTime;
+        state.formData.manager = res.data.data.projectInfo.manager
+        state.formData.sourceBelongId = res.data.data.projectInfo.sourceBelongId
+        state.formData.remark = res.data.data.stageList.remark
+        state.formData.courseSyncFlag = res.data.data.projectInfo.courseSyncFlag
+        state.formData.level = res.data.data.projectInfo.level
+        state.formData.systemId = res.data.data.projectInfo.systemId
+        state.formData.boeFlag = res.data.data.projectInfo.boeFlag
+        state.value2 = res.data.data.projectInfo.notice
+      }).catch(err => {
+        message.error("操作失败"+err)
+        console.log(err)
+      })
+    }
     // 编辑项目模板
     const editTemplate = () => {
       let obj = {
-        beginTime: state.formData.time,
-        boeFlag: state.formData.boeFlag,
-        category: 0,
-        courseSyncFlag: state.formData.courseSyncFlag,
-        endTime: state.formData.time,
-        level: state.formData.level,
-        manager: state.formData.manager,
-        managerId: "",
-        name: state.formData.name,
-        notice: "",
-        noticeFlag: 0,
-        picUrl: "",
-        projectTemplateId: 0,
-        remark: state.formData.remark,
-        sourceBelongId: state.formData.sourceBelongId,
-        status: 0,
-        systemId: state.formData.systemId,
+        "beginTime": state.formData.time,
+        "boeFlag": state.formData.boeFlag,
+        "category": 0,
+        "courseSyncFlag": state.formData.courseSyncFlag,
+        "endTime": state.formData.time,
+        "level": state.formData.level,
+        "manager": state.formData.manager,
+        "managerId": "",
+        "name": state.formData.name,
+        "notice": "",
+        "noticeFlag": 0,
+        "picUrl": "",
+        "projectTemplateId": 0,
+        "remark": state.formData.remark,
+        "sourceBelongId": state.formData.sourceBelongId,
+        "status": 0,
+        "systemId": state.formData.systemId
       };
-      api
-        .templateEdit(obj)
-        .methods(obj)
-        .then((res) => {
-          message.success("编辑成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("编辑失败" + err);
-          console.log(err);
-        });
-    };
+      api.templateEdit(obj).methods(obj).then(res => {
+        message.success("编辑成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑失败"+err)
+        console.log(err)
+      })
+    }
     // 发布公告
     const addNotice = () => {
       let obj = {
-        beginTime: 0,
-        boeFlag: 0,
-        category: 0,
-        courseSyncFlag: 0,
-        endTime: 0,
-        level: 0,
-        manager: "",
-        managerId: "",
-        name: "",
-        notice: state.value2,
-        noticeFlag: 0,
-        picUrl: "",
-        projectTemplateId: 0,
-        remark: "",
-        sourceBelongId: 0,
-        status: 0,
-        systemId: 0,
+        "beginTime": 0,
+        "boeFlag": 0,
+        "category": 0,
+        "courseSyncFlag": 0,
+        "endTime": 0,
+        "level": 0,
+        "manager": "",
+        "managerId": "",
+        "name": "",
+        "notice": state.value2,
+        "noticeFlag": 0,
+        "picUrl": "",
+        "projectTemplateId": 0,
+        "remark": "",
+        "sourceBelongId": 0,
+        "status": 0,
+        "systemId": 0
       };
-      api
-        .templateEdit(obj)
-        .methods(obj)
-        .then((res) => {
-          message.success("公告发布成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("公告发布失败" + err);
-          console.log(err);
-        });
-    };
+      api.templateEdit(obj).methods(obj).then(res => {
+        message.success("公告发布成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("公告发布失败"+err)
+        console.log(err)
+      })
+    }
     // 删除阶段
     const stateDel = (id) => {
-      api
-        .deleteStage(id)
-        .then((res) => {
-          message.success("删除阶段成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("删除阶段失败" + err);
-          console.log(err);
-        });
-    };
-
+      api.deleteStage(id).then(res => {
+        message.success("删除阶段成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("删除阶段失败"+err)
+        console.log(err)
+      })
+    }
+    
     // 删除任务
     const taskDel = (id) => {
-      api
-        .deleteTask(id)
-        .then((res) => {
-          message.success("删除任务成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("删除任务失败" + err);
-          console.log(err);
-        });
-    };
+      api.deleteTask(id).then(res => {
+      message.success("删除任务成功")
+      console.log(res)
+    }).catch(err => {
+      message.error("删除任务失败"+err)
+      console.log(err)
+    })
+    }
     const toEdit = () => {
       routered.push({
-        path: "/manage/templateAdd",
-        query: {
-          projectId: state.projectId,
-          name: state.name,
-        },
-      });
-    };
-    // 新建或编辑阶段
-    const stateEdit = () => {
-      let obj = {
-        name: "",
-        projectTemplateId: 0,
-        remark: "",
-        stageId: 0,
-      };
-      api
-        .editStagek(obj)
-        .then((res) => {
-          message.success("编辑阶段成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("编辑阶段失败" + err);
-          console.log(err);
+          path: "/templateAdd",
+          query: {
+            projectId: state.projectId,
+            name: state.name,
+          },
         });
-    };
+    }
+    // 新建或编辑阶段 
+    const stateEdit = () => {
+      let obj={
+        "name": "",
+        "projectTemplateId": 0,
+        "remark": "",
+        "stageId": 0
+      }
+      api.editStagek(obj).then(res => {
+        message.success("编辑阶段成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑阶段失败"+err)
+        console.log(err)
+      })
+    }
     //新建或编辑阶段任务
     const taskEdit = () => {
       let obj = {
-        courseId: 0,
-        duration: 0,
-        flag: true,
-        name: "",
-        projectTaskId: 0,
-        projectTemplateId: 0,
-        stageId: 0,
-        type: 0,
-      };
-      api
-        .editTask(obj)
-        .then((res) => {
-          message.success("编辑任务成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("编辑任务失败" + err);
-          console.log(err);
-        });
-    };
+        "courseId": 0,
+        "duration": 0,
+        "flag": true,
+        "name": "",
+        "projectTaskId": 0,
+        "projectTemplateId": 0,
+        "stageId": 0,
+        "type": 0
+      }
+      api.editTask(obj).then(res => {
+        message.success("编辑任务成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑任务失败"+err)
+        console.log(err)
+      })
+    }
     return {
       ...toRefs(state),
       value,
@@ -1063,11 +988,11 @@ export default defineComponent({
 </script>
 <style lang="scss">
 .editBtn {
-  float: right;
-  margin-right: 150px;
-  color: #4ea6ff;
-  cursor: pointer;
-}
+      float:right; 
+      margin-right: 150px;
+      color:#4ea6ff;
+      cursor: pointer;
+    }
 .clearfix:before,
 .clearfix:after {
   content: " ";
@@ -1110,7 +1035,7 @@ export default defineComponent({
         margin-top: 20px;
       }
     }
-
+    
     @media screen and (max-width: 1030px) {
       .imgfor {
         margin-left: 20px;
@@ -1237,15 +1162,15 @@ export default defineComponent({
     }
 
     .split {
-      width: 100%;
-      height: 20px;
-      background-color: #edf0f5;
-    }
-    .docListStyle {
-      display: flex;
-      width: 300px !important;
-      justify-content: space-around;
-    }
+        width: 100%;
+        height: 20px;
+        background-color: #edf0f5;
+      }
+      .docListStyle {
+        display: flex;
+        width: 300px !important;
+        justify-content: space-around;
+      }
     .taskBox {
       .onerow {
         //width: 100%;
@@ -1474,12 +1399,14 @@ export default defineComponent({
     }
 
     .notice {
+      
       .ntc_tit {
-        padding-top: 22px;
+        padding-top:22px;
         margin-left: 34px;
         font-size: 18px;
         font-weight: 500;
         color: #232425;
+        
       }
       .ntc_body {
         margin-left: 34px;
@@ -1501,6 +1428,7 @@ export default defineComponent({
             .btnarea {
               display: flex;
               justify-content: flex-end;
+              
             }
             .area_btn {
               width: 100px;
@@ -1535,7 +1463,7 @@ export default defineComponent({
     }
 
     .projectscore {
-      padding-top: 22px;
+      padding-top:22px;
       .pjc_tit {
         margin-left: 34px;
         font-size: 18px;
@@ -1614,7 +1542,7 @@ export default defineComponent({
     }
 
     .setting {
-      padding-top: 22px;
+      padding-top:22px;
       .set_tit {
         margin-left: 34px;
         font-size: 18px;
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index a809d8ee..b3af453b 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -6,30 +6,21 @@
           <div class="inpbox">
             <div class="inpbox1">
               <span>模版名称：</span>
-              <a-input
-                v-model:value="value1"
-                style="
+              <a-input v-model:value="value1" style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                "
-                placeholder="请输入项目名称"
-              />
+                " placeholder="请输入项目名称" />
             </div>
             <div class="inpbox1">
               <span>创建时间：</span>
-              <a-date-picker
-                v-model="selectTime"
-                type="date"
-                placeholder="创建时间"
-                style="
-                  width: 270px;
-                  height: 40px;
-                  border-radius: 8px;
-                  margin-right: 14px;
-                "
-              />
+              <a-date-picker v-model="selectTime" type="date" placeholder="创建时间" style="
+                width: 270px;
+                height: 40px; 
+                border-radius: 8px;
+                margin-right: 14px;
+                " />
             </div>
           </div>
         </div>
@@ -46,14 +37,8 @@
       </div>
       <div class="tmpl_body">
         <div class="tmpl_tabbox">
-          <a-table
-            :columns="columns1"
-            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
-            expandRowByClick="true"
-            @expand="expandTable"
-            :pagination="false"
-          />
+          <a-table :columns="columns1" :data-source="tableData1" :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true" @expand="expandTable" :pagination="pagination" />
         </div>
       </div>
     </div>
@@ -62,7 +47,7 @@
 <script>
 import { reactive, defineComponent, toRefs, onMounted } from "vue";
 import { message } from "ant-design-vue";
-import * as api from "@/api/indexLibrary";
+import * as api from "@/api/indexTemplate"
 const columns1 = [
   {
     title: "模版名称",
@@ -115,6 +100,7 @@ export default defineComponent({
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
+          projectTemplateId: 1,
         },
         {
           key: "2",
@@ -123,9 +109,9 @@ export default defineComponent({
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
-        },
+          projectTemplateId: 2,
+        }
       ],
-      // state
     });
     const getTableDate1 = () => {
       let data = state.tableData1;
@@ -146,17 +132,9 @@ export default defineComponent({
                       </router-link>
                     </div>
                     <div class="ops3">
-                      <div
-                        class="jc"
-                        onClick={() => {
-                          templateHadler({
-                            projectTemplateId: value.projectTemplateId,
-                            type: 0,
-                          });
-                        }}
-                      >
-                        撤回
-                      </div>
+                      <div class="jc"
+                        onClick={() => { templateHadler({ "projectTemplateId": value.projectTemplateId, "type": 0 }) }}
+                      >撤回</div>
                     </div>
                   </div>
                 ) : (
@@ -165,15 +143,8 @@ export default defineComponent({
                 {value.status === "未发布" ? (
                   <div class="nselect">
                     <div class="ops1">
-                      <div
-                        class="jc"
-                        onClick={() => {
-                          templateHadler({
-                            projectTemplateId: value.projectTemplateId,
-                            type: 1,
-                          });
-                        }}
-                      >
+                      <div class="jc"
+                        onClick={() => { templateHadler({ "projectTemplateId": value.projectTemplateId, "type": 1 }) }}>
                         发布
                         <span style="color:#E9E9E9;margin-left:15px;">|</span>
                       </div>
@@ -187,17 +158,9 @@ export default defineComponent({
                       </router-link>
                     </div>
                     <div class="ops3">
-                      <div
-                        class="jc"
-                        onClick={() => {
-                          templateHadler({
-                            projectTemplateId: value.projectTemplateId,
-                            type: -1,
-                          });
-                        }}
-                      >
-                        删除
-                      </div>
+                      <div class="jc"
+                        onClick={() => { templateHadler({ "projectTemplateId": value.projectTemplateId, "type": -1 }) }}
+                      >删除</div>
                     </div>
                   </div>
                 ) : (
@@ -210,67 +173,86 @@ export default defineComponent({
       });
       state.tableData = data;
     };
+    const pagination = reactive({
+      current: 1,
+      total: 50,
+      defaultPageSize: 10,
+      onChange: (id) => { pagination.current = id; getLibraryList() },
+    })
     getTableDate1();
 
     onMounted(() => {
       getLibraryList();
-    });
+    })
+
+    // 获取模板列表
     const getLibraryList = () => {
       let obj = {
-        beginTime: 0,
-        endTime: 0,
-        name: "",
-        pageNo: 0,
-        pageSize: 0,
-        status: 0,
-      };
-      api
-        .templateList(obj)
-        .then((res) => {
-          console.log(res);
-          let resData = res.data.data.rows;
-          if (resData.length) {
-            for (let i in resData) {
-              state.tableData1[i].id = i + 1;
-              state.tableData1[i].projectTemplateId =
-                resData[i].projectTemplateId;
-              state.tableData1[i].status = resData[i].status
-                ? "已发布"
-                : "未发布";
-              state.tableData1[i].name = resData[i].name;
-              state.tableData1[i].creator = resData[i].createName;
-              state.tableData1[i].stutime = resData[i].publishTime;
-              state.tableData1[i].operation = "operation";
-            }
-          } else {
-            message.warning("获取的列表数据为空值");
+        "beginTime": 0,
+        "endTime": 0,
+        "name": "",
+        "pageNo": pagination.current,
+        "pageSize": 10,
+        "status": 0 || 1
+      }
+      api.templateList(obj).then((res) => {
+        console.log(res);
+        let resData = res.data.data.rows
+        if (resData.length) {
+          for (let i in resData) {
+            state.tableData1[i].id = i + 1;
+            state.tableData1[i].projectTemplateId = resData[i].projectTemplateId;
+            state.tableData1[i].status = resData[i].status ? "已发布" : "未发布";
+            state.tableData1[i].name = resData[i].name;
+            state.tableData1[i].creator = resData[i].createName;
+            state.tableData1[i].stutime = resData[i].publishTime;
+            state.tableData1[i].operation = "operation";
           }
-        })
-        .catch((error) => {
-          message.error(`获取模板列表失败` + error);
-        });
+
+        } else {
+          message.warning("获取的列表数据为空值")
+        }
+      }).catch((error) => {
+        message.error(`获取模板列表失败` + error)
+      });
     };
     const templateHadler = (obj) => {
-      api
-        .templateHadle(obj)
-        .then((res) => {
-          if (res.data.success) {
-            message.success(`模板操作成功`);
-            getLibraryList();
-          }
-        })
-        .catch((error) => {
-          message.error(`模板操作失败` + error);
-        });
-    };
+      api.handleTemplates(obj).then((res) => {
+        if (res.data.success) {
+          message.success(`模板${obj.type == 1 ? '发布' : obj.type == 0 ? '撤回' : '删除'}成功`)
+          getLibraryList();
+        }
+      }).catch((error) => {
+        message.error(`模板${obj.type == 1 ? '发布' : obj.type == 0 ? '撤回' : '删除'}失败` + error)
+      })
+    }
     const searchLevel = () => {
-      const result = state.tableData1.filter(
-        (item) => item.name == state.value1
-      );
+      state.tableData1 = [
+        {
+          key: "1",
+          name: "测试模板1",
+          status: "已发布",
+          creator: "李部长",
+          stutime: "2022-10-31  23:12:00",
+          operation: "operation",
+          projectTemplateId: 1,
+        },
+        {
+          key: "2",
+          name: "测试模板2",
+          status: "未发布",
+          creator: "李部长",
+          stutime: "2022-10-31  23:12:00",
+          operation: "operation",
+          projectTemplateId: 2,
+        }
+      ];
+      const result = state.tableData1.filter(item => item.name.includes(state.value1))
       state.tableData1 = result;
+      getTableDate1()
     };
     const resetLevel = () => {
-      state.value1 = "";
+      state.value1 = '';
       // getLibraryList();
       state.tableData1 = [
         {
@@ -280,6 +262,7 @@ export default defineComponent({
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
+          projectTemplateId: 1,
         },
         {
           key: "2",
@@ -288,8 +271,10 @@ export default defineComponent({
           creator: "李部长",
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
-        },
-      ];
+          projectTemplateId: 2,
+        }
+      ]
+      getTableDate1()
     };
 
     return {
@@ -298,6 +283,7 @@ export default defineComponent({
       templateHadler,
       searchLevel,
       resetLevel,
+      pagination,
     };
   },
 });
@@ -305,8 +291,10 @@ export default defineComponent({
 <style lang="scss">
 .templatelibrary {
   width: 100%;
+
   .tmpl {
     width: 100%;
+
     .tmpl_header {
       display: flex;
       flex-wrap: wrap;
@@ -315,25 +303,30 @@ export default defineComponent({
 
       margin-left: 32px;
       margin-right: 32px;
+
       .tmplh_inp {
         .inpbox {
           display: flex;
           margin-top: 32px;
+
           .inpbox1 {
             display: flex;
             justify-content: center;
             align-items: center;
             margin-right: 24px;
+
             span {
               white-space: nowrap;
             }
           }
         }
       }
+
       .tmplh_btn {
         display: flex;
         margin-left: 38px;
         margin-top: 32px;
+
         .btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -344,72 +337,90 @@ export default defineComponent({
           margin-left: 14px;
           cursor: pointer;
           flex-shrink: 0;
+
           .search {
             background-size: 100%;
           }
+
           .btnText {
             font-size: 14px;
             font-weight: 400;
             line-height: 36px;
             margin-left: 5px;
           }
+
           .btnText1 {
             color: rgb(255, 255, 255);
           }
+
           .btnText2 {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn1 {
           background: #409eff;
+
           .search {
             width: 15px;
             height: 17px;
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
+
         .btn2 {
           background: #ffffff;
           border: 1px solid #388be1;
+
           .search {
             width: 16px;
             height: 18px;
             background-image: url("../../assets/images/courseManage/reset1.png");
           }
         }
+
         .btn1:hover {
           background: rgb(255, 255, 255);
           border: 1px solid #388be1;
+
           .search {
             background-image: url("../../assets/images/courseManage/search1.png");
           }
+
           .btnText {
             color: rgba(64, 158, 255, 1);
           }
         }
+
         .btn2:hover {
           background: rgba(64, 158, 255, 1);
+
           .search {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
+
           .btnText {
             color: #ffffff;
           }
         }
       }
     }
+
     .tmpl_body {
       padding: 0px 30px;
+
       .tmpl_tabbox {
         .operation {
           display: flex;
           justify-content: center;
           align-items: center;
           color: #4ea6ff;
+
           .nselect {
             justify-content: center;
             align-items: center;
             display: flex;
+
             .jc {
               margin-left: 20px;
               white-space: nowrap;

From 5828a5cccbab6a5a2efb4e5ea3e450f82595842c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Mon, 21 Nov 2022 16:03:31 +0800
Subject: [PATCH 81/90] =?UTF-8?q?feat=EF=BC=9A=E5=B7=B2=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/CourseReviewed.vue      | 277 +++++++++++++++++++++-
 src/views/examine/ProjectReviewed.vue     |  16 +-
 src/views/examine/ProjectReviewedN.vue    |  15 +-
 src/views/projectcenter/ProjectManage.vue |   6 +-
 4 files changed, 281 insertions(+), 33 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index bcfd1b1b..99a1c9c6 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -9,31 +9,294 @@
 <!-- 已审核课程页面 -->
 <template>
   <div class="coursereviewed">
-  
+    <div class="tmpl">
+      <div class="tmpl_header">
+        <div class="tmplh_inp">
+          <div class="inpbox">
+            <div class="inpbox1">
+              <a-select
+                v-model:value="valueproj"
+                placeholder="请输入内容分类"
+                @change="handleChangeproj"
+                :options="optionsproj"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuecreater"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入创建人"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuename"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入名称"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="tmplh_btn">
+          <div class="btn btn1">
+            <div class="search"></div>
+            <div class="btnText btnText1">搜索</div>
+          </div>
+          <div class="btn btn2">
+            <div class="search"></div>
+            <div class="btnText btnText2">重置</div>
+          </div>
+        </div>
+      </div>
+      <div class="tmpl_body">
+        <div class="tmpl_tabbox">
+          <a-table
+            :columns="columns1"
+            :data-source="tableData1"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :pagination="false"
+          />
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
-import { reactive, toRefs, } from "vue";
+import { reactive, toRefs } from "vue";
 
 export default {
   name: "CoursereViewed",
 
   setup() {
     const state = reactive({
-    
+      optionsproj: [
+        {
+          value: "jack",
+          label: "Jack",
+        },
+        {
+          value: "rose",
+          label: "rose",
+        },
+      ],
+      valueproj: null,
+      valuecreater: null,
+      valuename: null,
+
+      columns1: [
+        {
+          title: "序号",
+          dataIndex: "number",
+          key: "number",
+          align: "center",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          align: "center",
+        },
+        {
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
+          align: "center",
+        },
+        {
+          title: "内容分类",
+          dataIndex: "content",
+          key: "content",
+          align: "center",
+        },
+        {
+          title: "审核状态",
+          dataIndex: "status",
+          key: "status",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creater",
+          key: "creater",
+          align: "center",
+        },
+        {
+          title: "审核时间",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+        },
+        {
+          title: "审核说明",
+          dataIndex: "msg",
+          key: "msg",
+          align: "center",
+        },
+        {
+          title: "操作",
+          dataIndex: "opt",
+          key: "opt",
+          align: "center",
+          customRender: () => {
+            return <div>审核日志</div>;
+          },
+        },
+      ],
+      tableData1: [
+        {
+          number: "1",
+          name: "课程1",
+          type: "在线",
+          content: "领导力/领导业务",
+          status: "通过",
+          creater: "-",
+          time: "-",
+          msg: "-",
+        },
+      ],
     });
 
-   
     return {
       ...toRefs(state),
-      
     };
   },
 };
 </script>
 <style lang="scss">
 .coursereviewed {
- 
-}
+  width: 100%;
+  .tmpl {
+    width: 100%;
+    .tmpl_header {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      margin-bottom: 32px;
 
+      margin-left: 32px;
+      margin-right: 32px;
+      .tmplh_inp {
+        .inpbox {
+          display: flex;
+          margin-top: 32px;
+          .inpbox1 {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-right: 24px;
+            .ant-select-selector {
+              border-radius: 8px;
+              width: 270px;
+              height: 40px;
+              padding-top: 5px;
+            }
+            span {
+              white-space: nowrap;
+            }
+          }
+        }
+      }
+      .tmplh_btn {
+        display: flex;
+        margin-left: 38px;
+        margin-top: 32px;
+        .btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-left: 14px;
+          cursor: pointer;
+          flex-shrink: 0;
+          .search {
+            background-size: 100%;
+          }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+          .btnText1 {
+            color: rgb(255, 255, 255);
+          }
+          .btnText2 {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn1 {
+          background: #409eff;
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+        }
+        .btn2 {
+          background: #ffffff;
+          border: 1px solid #388be1;
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset1.png");
+          }
+        }
+        .btn1:hover {
+          background: rgb(255, 255, 255);
+          border: 1px solid #388be1;
+          .search {
+            background-image: url("../../assets/images/courseManage/search1.png");
+          }
+          .btnText {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn2:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+          .btnText {
+            color: #ffffff;
+          }
+        }
+      }
+    }
+    .tmpl_body {
+      padding: 0px 30px;
+      .tmpl_tabbox {
+        .operation {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #4ea6ff;
+          .nselect {
+            justify-content: center;
+            align-items: center;
+            display: flex;
+            .jc {
+              margin-left: 20px;
+              white-space: nowrap;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index 845fdde4..d8cf1d7b 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -6,34 +6,26 @@
  * @FilePath: /fe-manage/src/views/examine/ProjectReviewed.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
-<!-- 待审核课程页面 -->
+<!-- 已审核项目页面 -->
 <template>
-  <div class="projectviewed">
-  
-  </div>
+  <div class="projectviewed"></div>
 </template>
 <script>
-import { reactive, toRefs, } from "vue";
+import { reactive, toRefs } from "vue";
 
 export default {
   name: "ProjectViewed",
 
   setup() {
-    const state = reactive({
-    
-    });
+    const state = reactive({});
 
-   
     return {
       ...toRefs(state),
-      
     };
   },
 };
 </script>
 <style lang="scss">
 .projectviewed {
- 
 }
-
 </style>
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 823c1640..56931cc2 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -6,33 +6,26 @@
  * @FilePath: /fe-manage/src/views/examine/ProjectReviewedN.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
+<!-- 待审核项目页面 -->
 <template>
-  <div class="projectviewedn">
-  
-  </div>
+  <div class="projectviewedn"></div>
 </template>
 <script>
-import { reactive, toRefs, } from "vue";
+import { reactive, toRefs } from "vue";
 
 export default {
   name: "ProjectViewedN",
 
   setup() {
-    const state = reactive({
-    
-    });
+    const state = reactive({});
 
-   
     return {
       ...toRefs(state),
-      
     };
   },
 };
 </script>
 <style lang="scss">
 .projectviewedn {
- 
 }
-
 </style>
\ No newline at end of file
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 950929d5..afb947fb 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -2878,7 +2878,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/manage/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2937,7 +2937,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/manage/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2984,7 +2984,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/taskpage",
+                            path: "/manage/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}

From f18909673de49dbb99f60a34a322f9aa0d9590ac Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 21 Nov 2022 17:48:26 +0800
Subject: [PATCH 82/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                            |   5 +-
 src/api/index1.js                           |   6 +-
 src/components/BreadCrumb.vue               | 101 ++++++++----------
 src/components/NavLeft.vue                  |  64 +++++------
 src/components/OpenPages.vue                |   4 +-
 src/components/vote/CreateVote.vue          |   2 +-
 src/router/config.js                        |   4 +-
 src/router/index.js                         |   7 +-
 src/store/index.js                          |   4 +-
 src/views/learningpath/LearningPath.vue     |   4 +-
 src/views/learningpath/LevelAdd.vue         |  10 +-
 src/views/learningpath/LevelAddDetail.vue   |   4 +-
 src/views/learningpath/LevelCheck.vue       |   2 +-
 src/views/projectcenter/ClassAdd.vue        |  10 +-
 src/views/projectcenter/LibraryAdd.vue      |   6 +-
 src/views/projectcenter/ProjectAdd.vue      | 112 ++++++++++++--------
 src/views/projectcenter/ProjectManage.vue   |  36 +++----
 src/views/projectcenter/SonProject.vue      |  10 +-
 src/views/projectcenter/TaskAdd.vue         |   2 +-
 src/views/projectcenter/TaskPage.vue        | 104 +++++++++---------
 src/views/projectcenter/TemplateLibrary.vue |   4 +-
 src/views/projectcenter/templateAdd.vue     |   8 +-
 src/views/research/ManagePage.vue           |   4 +-
 src/views/research/ResearchAdd copy.vue     |   4 +-
 src/views/research/ResearchAdd.vue          |  10 +-
 src/views/research/ResearchManage.vue       |   4 +-
 src/views/system/SystemManage.vue           |   2 +-
 27 files changed, 280 insertions(+), 253 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 45195084..c62e1b47 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-20 18:18:11
+ * @LastEditTime: 2022-11-21 16:39:00
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -73,4 +73,5 @@ export const getTemplate = (obj) => http.post('/admin/project/template/list', ob
 export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', { params: obj })
 
 //获取项目统计
-export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
\ No newline at end of file
+export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })
+
diff --git a/src/api/index1.js b/src/api/index1.js
index 87fa03e2..6e5402e5 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 11:51:11
+ * @LastEditTime: 2022-11-21 16:39:08
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -85,10 +85,12 @@ export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj);
 export const billboard = (obj) => http.post('/admin/project/billboard', obj);
 //项目基础信息-----------------------------------
 
-
+//获取字典信息
+export const getDict = (obj) => http.post('/dict/getList', obj)
 // 获取组织结构树
 export const orgtree = () => http.get('/org/tree');
 
+
 //获取积分列表
 export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``)
 
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 93fa3e24..c4cb108c 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -34,8 +34,8 @@ export default {
         console.log("new:" + n + ",old:" + o);
 
         if (
-          n.indexOf("/manage/learningpath") !== -1 ||
-          n.indexOf("/manage/LearningPath") !== -1
+          n.indexOf("/learningpath") !== -1 ||
+          n.indexOf("/LearningPath") !== -1
         ) {
           state.list = [
             {
@@ -45,14 +45,11 @@ export default {
             },
           ];
         }
-        if (
-          n.indexOf("/manage/leveladd") !== -1 ||
-          n.indexOf("/manage/LevelAdd") !== -1
-        ) {
+        if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) {
           state.list = [
             {
               name: "学习路径",
-              href: "/manage/learningpath",
+              href: "/learningpath",
             },
             {
               name: "管理",
@@ -60,17 +57,17 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/leveladddetail") !== -1 ||
-          n.indexOf("/manage/LevelAddDetail") !== -1
+          n.indexOf("/leveladddetail") !== -1 ||
+          n.indexOf("/LevelAddDetail") !== -1
         ) {
           state.list = [
             {
               name: "学习路径",
-              href: "/manage/learningpath",
+              href: "/learningpath",
             },
             {
               name: "管理",
-              href: "/manage/leveladd",
+              href: "/leveladd",
             },
             {
               name: "创建关卡",
@@ -78,17 +75,17 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/levelcheck") !== -1 ||
-          n.indexOf("/manage/LevelCheck") !== -1
+          n.indexOf("/levelcheck") !== -1 ||
+          n.indexOf("/LevelCheck") !== -1
         ) {
           state.list = [
             {
               name: "学习路径",
-              href: "/manage/learningpath",
+              href: "/learningpath",
             },
             {
               name: "管理",
-              href: "/manage/leveladd",
+              href: "/leveladd",
             },
             {
               name: "查看",
@@ -96,8 +93,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/projectmanage") !== -1 ||
-          n.indexOf("/manage/ProjectManage") !== -1
+          n.indexOf("/projectmanage") !== -1 ||
+          n.indexOf("/ProjectManage") !== -1
         ) {
           state.list = [
             {
@@ -112,23 +109,20 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/projectadd") !== -1 ||
-          n.indexOf("/manage/ProjectAdd") !== -1
+          n.indexOf("/projectadd") !== -1 ||
+          n.indexOf("/ProjectAdd") !== -1
         ) {
           state.list = [
             {
               name: "项目",
-              href: "/manage/projectmanage",
+              href: "/projectmanage",
             },
             {
               name: "创建项目",
             },
           ];
         }
-        if (
-          n.indexOf("/manage/taskpage") !== -1 ||
-          n.indexOf("/manage/TaskPage") !== -1
-        ) {
+        if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) {
           state.list = [
             {
               name: "项目",
@@ -139,10 +133,7 @@ export default {
             },
           ];
         }
-        if (
-          n.indexOf("/manage/taskadd") !== -1 ||
-          n.indexOf("/manage/TaskAdd") !== -1
-        ) {
+        if (n.indexOf("/taskadd") !== -1 || n.indexOf("/TaskAdd") !== -1) {
           state.list = [
             {
               name: "项目",
@@ -160,8 +151,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/templatelibrary") !== -1 ||
-          n.indexOf("/manage/TemplateLibrary") !== -1
+          n.indexOf("/templatelibrary") !== -1 ||
+          n.indexOf("/TemplateLibrary") !== -1
         ) {
           state.list = [
             {
@@ -173,8 +164,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/libraryadd") !== -1 ||
-          n.indexOf("/manage/LibraryAdd") !== -1
+          n.indexOf("/libraryadd") !== -1 ||
+          n.indexOf("/LibraryAdd") !== -1
         ) {
           state.list = [
             {
@@ -185,13 +176,13 @@ export default {
             },
             {
               name: "查看",
-              href: "/manage/libraryadd",
+              href: "/libraryadd",
             },
           ];
         }
         if (
-          n.indexOf("/manage/coursemanage") !== -1 ||
-          n.indexOf("/manage/CourseManage") !== -1
+          n.indexOf("/coursemanage") !== -1 ||
+          n.indexOf("/CourseManage") !== -1
         ) {
           state.list = [
             {
@@ -206,8 +197,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/coursewaremanage") !== -1 ||
-          n.indexOf("/manage/CoursewareManage") !== -1
+          n.indexOf("/coursewaremanage") !== -1 ||
+          n.indexOf("/CoursewareManage") !== -1
         ) {
           state.list = [
             {
@@ -219,8 +210,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/researchmanage") !== -1 ||
-          n.indexOf("/manage/ResearchManage") !== -1
+          n.indexOf("/researchmanage") !== -1 ||
+          n.indexOf("/ResearchManage") !== -1
         ) {
           state.list = [
             {
@@ -231,8 +222,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/managepage") !== -1 ||
-          n.indexOf("/manage/ManagePage") !== -1
+          n.indexOf("/managepage") !== -1 ||
+          n.indexOf("/ManagePage") !== -1
         ) {
           state.list = [
             {
@@ -247,8 +238,8 @@ export default {
         }
 
         if (
-          n.indexOf("/manage/researchadd") !== -1 ||
-          n.indexOf("/manage/ResearchAdd") !== -1
+          n.indexOf("/researchadd") !== -1 ||
+          n.indexOf("/ResearchAdd") !== -1
         ) {
           state.list = [
             {
@@ -263,8 +254,8 @@ export default {
         }
 
         if (
-          n.indexOf("/manage/certificatecenter") !== -1 ||
-          n.indexOf("/manage/CertificateCenter") !== -1
+          n.indexOf("/certificatecenter") !== -1 ||
+          n.indexOf("/CertificateCenter") !== -1
         ) {
           state.list = [
             {
@@ -273,8 +264,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/systemmanage") !== -1 ||
-          n.indexOf("/manage/SystemManage") !== -1
+          n.indexOf("/systemmanage") !== -1 ||
+          n.indexOf("/SystemManage") !== -1
         ) {
           state.list = [
             {
@@ -283,8 +274,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/coursereviewed") !== -1 ||
-          n.indexOf("/manage/CourseReiewed") !== -1
+          n.indexOf("/coursereviewed") !== -1 ||
+          n.indexOf("/CourseReiewed") !== -1
         ) {
           state.list = [
             {
@@ -296,8 +287,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/coursereviewedn") !== -1 ||
-          n.indexOf("/manage/CourseReiewedN") !== -1
+          n.indexOf("/coursereviewedn") !== -1 ||
+          n.indexOf("/CourseReiewedN") !== -1
         ) {
           state.list = [
             {
@@ -309,8 +300,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/projectreviewed") !== -1 ||
-          n.indexOf("/manage/ProjectReviewed") !== -1
+          n.indexOf("/projectreviewed") !== -1 ||
+          n.indexOf("/ProjectReviewed") !== -1
         ) {
           state.list = [
             {
@@ -322,8 +313,8 @@ export default {
           ];
         }
         if (
-          n.indexOf("/manage/projectreviewedn") !== -1 ||
-          n.indexOf("/manage/ProjectReviewedN") !== -1
+          n.indexOf("/projectreviewedn") !== -1 ||
+          n.indexOf("/ProjectReviewedN") !== -1
         ) {
           state.list = [
             {
diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 87f64f4b..ce679c18 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -44,7 +44,7 @@
                 circle: selectedKeys[0] === 'sub10-1' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/coursereviewedn">待审核课程</router-link>
+            <router-link to="/coursereviewedn">待审核课程</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-2">
             <span
@@ -53,7 +53,7 @@
                 circle: selectedKeys[0] === 'sub10-2' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/coursereviewed">已审核课程</router-link>
+            <router-link to="/coursereviewed">已审核课程</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-3">
             <span
@@ -62,7 +62,7 @@
                 circle: selectedKeys[0] === 'sub10-3' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/projectreviewedn">待审核项目</router-link>
+            <router-link to="/projectreviewedn">待审核项目</router-link>
           </a-menu-item>
           <a-menu-item key="sub10-4">
             <span
@@ -71,7 +71,7 @@
                 circle: selectedKeys[0] === 'sub10-4' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/projectreviewed">已审核项目</router-link>
+            <router-link to="/projectreviewed">已审核项目</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -82,7 +82,7 @@
               src="../assets/images/navleft/studyPath.png"
             />
           </div>
-          <router-link to="/manage/learningpath">学习路径</router-link>
+          <router-link to="/learningpath">学习路径</router-link>
         </a-menu-item>
 
         <a-sub-menu key="sub2" @titleClick="titleClick">
@@ -102,7 +102,7 @@
                 circle: selectedKeys[0] === 'sub2-1' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/projectmanage">项目</router-link>
+            <router-link to="/projectmanage">项目</router-link>
           </a-menu-item>
           <a-menu-item key="sub2-2">
             <span
@@ -111,7 +111,7 @@
                 circle: selectedKeys[0] === 'sub2-2' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/templatelibrary">模板库</router-link>
+            <router-link to="/templatelibrary">模板库</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -132,7 +132,7 @@
                 circle: selectedKeys[0] === 'sub3-1' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/coursemanage">课件管理</router-link>
+            <router-link to="/coursemanage">课件管理</router-link>
           </a-menu-item>
           <a-menu-item key="sub3-2">
             <span
@@ -141,7 +141,7 @@
                 circle: selectedKeys[0] === 'sub3-2' ? false : true,
               }"
             ></span>
-            <router-link to="/manage/coursewaremanage">课程管理</router-link>
+            <router-link to="/coursewaremanage">课程管理</router-link>
           </a-menu-item>
         </a-sub-menu>
 
@@ -162,7 +162,7 @@
               src="../assets/images/navleft/survey.png"
             />
           </div>
-          <router-link to="/manage/researchmanage">评估管理</router-link>
+          <router-link to="/researchmanage">评估管理</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub6" @titleClick="titleClick">
@@ -193,7 +193,7 @@
             />
           </div>
 
-          <router-link to="/manage/certificatecenter">证书中心</router-link>
+          <router-link to="/certificatecenter">证书中心</router-link>
         </a-menu-item>
         <a-menu-item key="sub9" @titleClick="titleClick">
           <div class="imgBox">
@@ -202,7 +202,7 @@
               src="../assets/images/navleft/system.png"
             />
           </div>
-          <router-link to="/manage/systemmanage">系统管理</router-link>
+          <router-link to="/systemmanage">系统管理</router-link>
         </a-menu-item>
       </a-menu>
     </div>
@@ -220,15 +220,15 @@
         @click="handleClick"
       >
         <a-menu-item key="sub1" @titleClick="titleClick">
-          <router-link to="/manage/learningpath">学习</router-link>
+          <router-link to="/learningpath">学习</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub2" @titleClick="titleClick">
-          <router-link to="/manage/projectmanage">项目</router-link>
+          <router-link to="/projectmanage">项目</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub3" @titleClick="titleClick">
-          <router-link to="/manage/coursewaremanage">课程</router-link>
+          <router-link to="/coursewaremanage">课程</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub4" @titleClick="titleClick">
@@ -295,104 +295,104 @@ export default {
 
       keysList: [
         {
-          href: "/manage/coursereviewedn",
+          href: "/coursereviewedn",
           openKeys: "sub10",
           selectedKeys: "sub10-1",
           pagename: "待审核课程",
         },
         {
-          href: "/manage/coursereviewed",
+          href: "/coursereviewed",
           openKeys: "sub10",
           selectedKeys: "sub10-2",
           pagename: "已审核课程",
         },
         {
-          href: "/manage/projectreviewedn",
+          href: "/projectreviewedn",
           openKeys: "sub10",
           selectedKeys: "sub10-3",
           pagename: "待审核项目",
         },
         {
-          href: "/manage/projectrrviewed",
+          href: "/projectrrviewed",
           openKeys: "sub10",
           selectedKeys: "sub10-4",
           pagename: "已审核项目",
         },
         {
-          href: "/manage/learningpath",
+          href: "/learningpath",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "学习路径",
         },
         {
-          href: "/manage/leveladd",
+          href: "/leveladd",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "关卡",
         },
         {
-          href: "/manage/levelcheck",
+          href: "/levelcheck",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "查看",
         },
         {
-          href: "/manage/leveladddetail",
+          href: "/leveladddetail",
           openKeys: "sub1",
           selectedKeys: "sub1",
           pagename: "创建关卡",
         },
         {
-          href: "/manage/projectmanage",
+          href: "/projectmanage",
           openKeys: "sub2",
           selectedKeys: "sub2-1",
           pagename: "项目",
         },
         {
-          href: "/manage/projectadd",
+          href: "/projectadd",
           openKeys: "sub2",
           selectedKeys: "sub2-1",
           pagename: "创建项目",
         },
         {
-          href: "/manage/templatelibrary",
+          href: "/templatelibrary",
           openKeys: "sub2",
           selectedKeys: "sub2-2",
           pagename: "模板库",
         },
         {
-          href: "/manage/libraryadd",
+          href: "/libraryadd",
           openKeys: "sub2",
           selectedKeys: "sub2-2",
           pagename: "查看",
         },
         {
-          href: "/manage/coursemanage",
+          href: "/coursemanage",
           openKeys: "sub3",
           selectedKeys: "sub3-1",
           pagename: "课件管理",
         },
         {
-          href: "/manage/coursewaremanage",
+          href: "/coursewaremanage",
           openKeys: "sub3",
           selectedKeys: "sub3-2",
           pagename: "课程管理",
         },
         {
-          href: "/manage/certificatecenter",
+          href: "/certificatecenter",
           openKeys: "sub8",
           selectedKeys: "sub8",
           pagename: "证书中心",
         },
 
         {
-          href: "/manage/systemmanage",
+          href: "/systemmanage",
           openKeys: "sub9",
           selectedKeys: "sub9",
           pagename: "系统管理",
         },
         {
-          href: "/manage/researchmanage",
+          href: "/researchmanage",
           openKeys: "sub5",
           selectedKeys: "sub5",
           pagename: "评估管理",
diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue
index 96fd7655..721b819b 100644
--- a/src/components/OpenPages.vue
+++ b/src/components/OpenPages.vue
@@ -58,10 +58,10 @@ export default {
       state.openList.map((item, key) => {
         if (item.href === value.href) {
           if (state.openList.length === 1) {
-            if (state.openList[0].href !== "/manage/learningpath") {
+            if (state.openList[0].href !== "/learningpath") {
               state.openList.splice(key, 1);
             }
-            $router.push({ path: "/manage/learningpath" });
+            $router.push({ path: "/learningpath" });
           } else {
             if (value.active) {
               if (key === state.openList.length - 1) {
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 3cf72955..bc862db1 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -366,7 +366,7 @@ export default {
           if (res.data.code === 200) {
             message.success("编辑成功");
             router.push({
-              path: "/manage/researchmanage",
+              path: "/researchmanage",
             });
           }
         });
diff --git a/src/router/config.js b/src/router/config.js
index 27b6f975..27b1e0cb 100644
--- a/src/router/config.js
+++ b/src/router/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 15:06:51
+ * @LastEditTime: 2022-11-21 17:42:50
  * @FilePath: /fe-manage/src/router/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -12,7 +12,7 @@ context.keys().forEach((path) => {
   // console.log('path', path)
   const componentName = path.replace(/.*\/([^\\.\\/]*)\.vue$/, "$1");
   routes.push({
-    path: `/manage/${componentName.toLowerCase()}/:id?`,
+    path: `/${componentName.toLowerCase()}/:id?`,
     name: componentName,
     component: () => context(path),
     meta: {
diff --git a/src/router/index.js b/src/router/index.js
index 06d1632f..75da5b5a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 14:55:13
+ * @LastEditTime: 2022-11-21 17:42:59
  * @FilePath: /fe-manage/src/router/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -12,13 +12,12 @@ const routes = [
 	{
 		path: '/',
 		name: '首页',
-		redirect: '/manage/learningpath'
+		redirect: '/learningpath'
 	},
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory(),
-	base: '/manage',
+	history: createWebHistory("/manage/"),
 	routes,
 
 })
diff --git a/src/store/index.js b/src/store/index.js
index 2e92cedb..9056d61c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 14:50:47
+ * @LastEditTime: 2022-11-21 17:43:07
  * @FilePath: /fe-manage/src/store/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -15,7 +15,7 @@ export default createStore({
       : [
         {
           pagename: "学习路径",
-          href: "/manage/learningpath",
+          href: "/learningpath",
           active: true,
         },
       ],
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 5cc8b378..7e7a1fed 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -49,7 +49,7 @@
         </div>
       </div>
       <div class="btns">
-        <!-- <router-link to="/manage/projectadd">
+        <!-- <router-link to="/projectadd">
           <div class="btn btn3">
             <div class="search"></div>
             <div class="btnText">创建路径</div>
@@ -1213,7 +1213,7 @@ export default {
                     class="g1"
                     onClick={() => {
                       router.push({
-                        path: "/manage/leveladd",
+                        path: "/leveladd",
                       });
                       storage.set("routerId", text.record.id);
                     }}
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index def8e4c5..4b48cbb3 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -73,7 +73,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/manage/learningpath"
+        <router-link to="/learningpath"
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -98,7 +98,7 @@
               <div class="taskmain">快速创建项目详情</div>
             </div>
             <div class="second">
-              <router-link :to="{ path: '/manage/leveladddetail' }">
+              <router-link :to="{ path: '/leveladddetail' }">
                 <div
                   class="taskbox"
                   style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -312,7 +312,7 @@
                     <div class="search"></div>
                     <div class="btnText">重置</div>
                   </div>
-                  <router-link to="/manage/leveladddetail">
+                  <router-link to="/leveladddetail">
                     <div class="btn btn3" @click="handleOut">
                       <div class="search"></div>
                       <div class="btnText">创建关卡</div>
@@ -334,7 +334,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
 
-              <router-link to="/manage/leveladddetail" class="editright">
+              <router-link to="/leveladddetail" class="editright">
                 <img
                   class="editimg"
                   src="../../assets/images/leveladd/edit.png"
@@ -344,7 +344,7 @@
             </div>
             <!-- 无数据显示快速创建 -->
             <div v-show="!taskSyllabus.length">
-              <router-link :to="{ path: '/manage/leveladddetail' }">
+              <router-link :to="{ path: '/leveladddetail' }">
                 <div
                   class="taskbox"
                   style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index bf7a8a35..6780fa61 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -194,7 +194,7 @@
                 <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
               </div>
               <div class="line"></div>
-              <router-link to="/manage/leveladd">
+              <router-link to="/leveladd">
                 <div style="display: flex">
                   <img
                     class="img2"
@@ -758,7 +758,7 @@
                 <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
               </div>
               <div class="line"></div>
-              <router-link to="/manage/leveladd">
+              <router-link to="/leveladd">
                 <div style="display: flex">
                   <img
                     class="img2"
diff --git a/src/views/learningpath/LevelCheck.vue b/src/views/learningpath/LevelCheck.vue
index fc143792..707acf60 100644
--- a/src/views/learningpath/LevelCheck.vue
+++ b/src/views/learningpath/LevelCheck.vue
@@ -31,7 +31,7 @@
           </div>
         </div>
         <div class="lne"></div>
-        <router-link to="/manage/leveladd">
+        <router-link to="/leveladd">
           <div class="return">
             <div class="im"></div>
             <div class="fan">返回</div>
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index 0b5c8b12..57526254 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/manage/projectmanage"
+        to="/projectmanage"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -408,7 +408,7 @@ export default {
 
     if (routers.query.name == undefined) {
       router.push({
-        path: "/manage/projectmanage",
+        path: "/projectmanage",
       });
     }
 
@@ -481,7 +481,7 @@ export default {
     const backPage = () => {
       setTimeout(() => {
         router.push({
-          path: "/manage/projectmanage",
+          path: "/projectmanage",
         });
       }, 400);
     };
@@ -800,7 +800,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/projectmanage",
+                  path: "/projectmanage",
                 });
               }, 1000);
             } else {
@@ -855,7 +855,7 @@ export default {
               message.success("创建成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/taskpage",
+                  path: "/taskpage",
                   query: { id: res.data.data.projectId },
                 });
               }, 1000);
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 851e7e8e..aa9a37f3 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/manage/templatelibrary"
+        <router-link to="/templatelibrary"
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -55,7 +55,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
               <button class="btn" @click="showFaceIn">批量面授报名</button>
-              <router-link to="/manage/taskadd" class="edit">
+              <router-link to="/taskadd" class="edit">
                 <img
                   class="editimg"
                   src="../../assets/images/projectadd/edit.png"
@@ -986,7 +986,7 @@ export default defineComponent({
     };
     const toEdit = () => {
       routered.push({
-        path: "/manage/templateAdd",
+        path: "/templateAdd",
         query: {
           projectId: state.projectId,
           name: state.name,
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 900c780c..9958aeb4 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/manage/projectmanage"
+        to="/projectmanage"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -48,13 +48,17 @@
                 }
               "
               v-model:value="classifySelect"
-              placeholder="四个养成"
+              placeholder="请选择分类"
               style="width: 100%"
               :options="classifyList"
               @change="classificationChange"
               allowClear
               showSearch
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             >
             </a-select>
           </div>
@@ -79,7 +83,18 @@
               overflow: hidden;
             "
           >
-            <a-upload
+            <img
+              style="
+                width: 100px;
+                height: 100px;
+                margin-bottom: 4px;
+                margin-right: 4px;
+              "
+              v-if="imageUrl"
+              :src="imageUrl"
+              alt="avatar"
+            />
+            <!-- <a-upload
               v-model:file-list="fileList"
               name="file"
               list-type="picture-card"
@@ -102,13 +117,10 @@
                 alt="avatar"
               />
               <div v-else>
-                <!-- <loading-outlined v-if="loading"></loading-outlined> -->
-                <!-- <plus-outlined v-else></plus-outlined> -->
                 <div class="box1"></div>
                 <div class="box2"></div>
-                <!-- <div class="ant-upload-text"></div> -->
               </div>
-            </a-upload>
+            </a-upload> -->
           </div>
         </div>
         <div class="name">
@@ -263,9 +275,14 @@
               "
               v-model:value="classifySelect3"
               :options="classifyList3"
+              style="width: 100%"
               @change="classificationChange3"
-              placeholder="集团级/组织级/现地级/部门级"
+              placeholder="请选择项目级别"
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             />
           </div>
         </div>
@@ -286,8 +303,9 @@
               "
               v-model:value="classifySelect4"
               :options="classifyList4"
+              style="width: 100%"
               @change="classificationChange4"
-              placeholder="集团级/组织级/现地级/部门级"
+              placeholder="请选择培训分类"
               :disabled="viewDetail ? true : false"
             />
           </div>
@@ -392,7 +410,7 @@ import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
-// import * as api1 from "../../api/index1";
+import * as api1 from "../../api/index1";
 import { storage } from "../../api/storage";
 import { toDate } from "../../api/method";
 import { useStore } from "vuex";
@@ -530,7 +548,7 @@ export default {
       storage.remove("projectAddId");
       setTimeout(() => {
         router.push({
-          path: "/manage/projectmanage",
+          path: "/projectmanage",
         });
       }, 400);
     };
@@ -558,15 +576,41 @@ export default {
     });
 
     const projectName = ref("");
-
-    const classifyList = ref([
-      { value: 1, label: "管理者" },
-      { value: 2, label: "领军者" },
-      { value: 3, label: "产业人" },
-    ]);
+    //分类
+    const classifyList = ref([]);
+    const getDictList = (param) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 20,
+        setCode: param,
+      };
+      api1
+        .getDict(obj)
+        .then((res) => {
+          console.log("获取字典成功", res);
+          if (res.status === 200) {
+            if (param === "projectClass") {
+              classifyList.value = res.data.data.rows;
+            }
+            if (param === "projectPic") {
+              if (res.data.data.rows.length > 0) {
+                imageUrl.value = res.data.data.rows[0].dictValue;
+              }
+            }
+            if (param === "projectLevel") {
+              classifyList3.value = res.data.data.rows;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取字典失败", err);
+        });
+    };
+    getDictList("projectClass");
+    getDictList("projectPic");
+    getDictList("projectLevel");
 
     let projectType = "";
-
     const classificationChange = (value) => {
       console.log(`selected ${value}`);
       projectType = value;
@@ -721,25 +765,9 @@ export default {
 
     // 资源归属 sourceBelongId 后续给接口
     const classifyList2 = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : ref(null);
+      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
     });
 
-    // //获取资源归属
-    // const orgTree = () => {
-    //   api1
-    //     .orgtree()
-    //     .then((res) => {
-    //       console.log("获取集团组织成功", res);
-    //       if (res.status === 200) {
-    //         classifyList2.value = res.data.data;
-    //       }
-    //     })
-    //     .catch((err) => {
-    //       console.log("获取集团组织失败", err);
-    //     });
-    // };
-    // orgTree();
-
     let sourceBelongIdC = "";
     const classificationChange2 = (key) => {
       console.log(`selected ${key}`, classifyList2);
@@ -748,10 +776,10 @@ export default {
 
     // 项目级别
     const classifyList3 = ref([
-      { value: 1, label: "集团级" },
-      { value: 2, label: "组织级" },
-      { value: 3, label: "现地级" },
-      { value: 4, label: "部门级" },
+      // { value: 1, label: "集团级" },
+      // { value: 2, label: "组织级" },
+      // { value: 3, label: "现地级" },
+      // { value: 4, label: "部门级" },
     ]);
 
     let levels = "";
@@ -874,7 +902,7 @@ export default {
         });
     };
     getTemplate();
-    //模版滚动加载信息
+    //模版滚动加载模板信息
     const templateScroll = (e) => {
       // console.log("滚动", e, b);
       const { target } = e;
@@ -993,7 +1021,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/projectmanage",
+                  path: "/projectmanage",
                 });
               }, 1000);
             } else {
@@ -1048,7 +1076,7 @@ export default {
               message.success("创建成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/taskpage",
+                  path: "/taskpage",
                   query: { id: res.data.data.projectId },
                 });
               }, 1000);
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 2544ae97..950929d5 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -259,7 +259,7 @@
             </div>
           </div>
           <div class="modalMain">
-            <router-link to="/manage/projectadd">
+            <router-link to="/projectadd">
               <div
                 class="taskbox"
                 style="
@@ -1513,7 +1513,7 @@ export default {
     const createChildProject = () => {
       console.log(state.currentProjectId);
       router.push({
-        path: "/manage/sonproject",
+        path: "/sonproject",
         query: {
           projectId: state.currentProjectId,
           name: state.currentProjectName,
@@ -2182,7 +2182,7 @@ export default {
                   >
                     {/* 
 										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/manage/taskpage">基础信息</router-link>
+											<router-link to="/taskpage">基础信息</router-link>
 										</a-select-option>
 										<a-select-option value="存为模版" label="存为模版">
 											<div
@@ -2280,7 +2280,7 @@ export default {
                   >
                     {/* 
 										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/manage/taskpage">基础信息</router-link>
+											<router-link to="/taskpage">基础信息</router-link>
 										</a-select-option>
 										<a-select-option value="存为模版" label="存为模版">
 											<div
@@ -2368,7 +2368,7 @@ export default {
                   >
                     {/* 
 										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/manage/taskpage">基础信息</router-link>
+											<router-link to="/taskpage">基础信息</router-link>
 										</a-select-option>
 										<a-select-option value="存为模版" label="存为模版">
 											<div
@@ -2474,7 +2474,7 @@ export default {
                 <div
                   onClick={() => {
                     router.push({
-                      path: "/manage/classadd",
+                      path: "/classadd",
                       query: {
                         projectId: value.record.projectId,
                         name: value.record.name,
@@ -2482,7 +2482,7 @@ export default {
                     });
                   }}
                   style={{ cursor: "pointer" }}
-                  to="/manage/classadd"
+                  to="/classadd"
                   class="operation3"
                 >
                   创建班级
@@ -2566,7 +2566,7 @@ export default {
                   </a-select>
                 </div>
 
-                <router-link to="/manage/classadd" class="operation3">
+                <router-link to="/classadd" class="operation3">
                   创建班级
                 </router-link>
                 <div class="tableSelect">
@@ -2683,7 +2683,7 @@ export default {
                     }
                     if (value.record.parentId == "0") {
                       router.push({
-                        path: "/manage/projectadd",
+                        path: "/projectadd",
                         query: {
                           projectId: value.record.projectId,
                           name: value.record.name,
@@ -2692,7 +2692,7 @@ export default {
                     } else {
                       if (value.record.isbj) {
                         router.push({
-                          path: "/manage/classadd",
+                          path: "/classadd",
                           query: {
                             projectId: value.record.projectId,
                             name: value.record.paraentName,
@@ -2701,7 +2701,7 @@ export default {
                         });
                       } else {
                         router.push({
-                          path: "/manage/sonproject",
+                          path: "/sonproject",
                           query: {
                             projectId: value.record.projectId,
                             name: value.record.paraentName,
@@ -2728,7 +2728,7 @@ export default {
                 //     }
                 //     if (value.record.parentId == "0") {
                 //       router.push({
-                //         path: "/manage/projectadd",
+                //         path: "/projectadd",
                 //         query: {
                 //           projectId: value.record.projectId,
                 //           name: value.record.name,
@@ -2738,7 +2738,7 @@ export default {
                 //     } else {
                 //       if (value.record.isbj) {
                 //         router.push({
-                //           path: "/manage/classadd",
+                //           path: "/classadd",
                 //           query: {
                 //             projectId: value.record.projectId,
                 //             name: value.record.paraentName,
@@ -2748,7 +2748,7 @@ export default {
                 //         });
                 //       } else {
                 //         router.push({
-                //           path: "/manage/sonproject",
+                //           path: "/sonproject",
                 //           query: {
                 //             projectId: value.record.projectId,
                 //             name: value.record.paraentName,
@@ -2878,7 +2878,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/manage/taskpage",
+                            path: "/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2937,7 +2937,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/manage/taskpage",
+                            path: "/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2984,7 +2984,7 @@ export default {
                       <div
                         onClick={() => {
                           router.push({
-                            path: "/manage/taskpage",
+                            path: "/taskpage",
                           });
                           storage.set("projectId", value.record.projectId);
                         }}
@@ -2992,7 +2992,7 @@ export default {
                         基础信息
                       </div>
                       {/**
-											<router-link to="/manage/taskpage">基础信息</router-link>
+											<router-link to="/taskpage">基础信息</router-link>
 											*/}
                     </a-select-option>
                   </a-select>
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 7b1dfa20..d09e7be9 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/manage/projectmanage"
+        to="/projectmanage"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -408,7 +408,7 @@ export default {
 
     if (routers.query.name == undefined) {
       router.push({
-        path: "/manage/projectmanage",
+        path: "/projectmanage",
       });
     }
 
@@ -481,7 +481,7 @@ export default {
     const backPage = () => {
       setTimeout(() => {
         router.push({
-          path: "/manage/projectmanage",
+          path: "/projectmanage",
         });
       }, 400);
     };
@@ -800,7 +800,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/projectmanage",
+                  path: "/projectmanage",
                 });
               }, 1000);
             } else {
@@ -855,7 +855,7 @@ export default {
               message.success("创建成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/taskpage",
+                  path: "/taskpage",
                   query: { id: res.data.data.projectId },
                 });
               }, 1000);
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 831dad0c..9ee429ee 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -149,7 +149,7 @@
               <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
             <div class="pub">保存</div>
             <div class="line"></div> -->
-              <router-link to="/manage/taskpage">
+              <router-link to="/taskpage">
                 <div style="display: flex">
                   <img
                     class="img2"
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 10cc4022..d46173ad 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -86,7 +86,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/manage/projectmanage">
+        <router-link to="/projectmanage">
           <div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -321,8 +321,8 @@
               <button class="btn" @click="showFaceIn" v-if="morFaceT">
                 批量面授报名
               </button>
-              <router-link to="/manage/taskadd">
-                <button to="/manage/taskadd" class="edit">
+              <router-link to="/taskadd">
+                <button to="/taskadd" class="edit">
                   <img
                     class="editimg"
                     src="../../assets/images/projectadd/edit.png"
@@ -505,7 +505,7 @@
               </a-collapse>
               <!-- 无数据创建任务  v-if="taskSyllabus.length == 0"-->
               <router-link
-                to="/manage/taskadd"
+                to="/taskadd"
                 class="taskbox"
                 style="
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
@@ -1062,7 +1062,11 @@
                         <span style="font: oblique bold 16px Sans-serif">{{
                           item.name
                         }}</span>
-                        <span style="color: #4ea6ff; float: right;cursor: pointer;" @click="deFile(item.uid)">删除</span>
+                        <span
+                          style="color: #4ea6ff; float: right; cursor: pointer"
+                          @click="deFile(item.uid)"
+                          >删除</span
+                        >
                       </div>
                     </div>
                   </div>
@@ -3260,7 +3264,7 @@ export default {
           let luj = info.attach;
           console.log("lulj", luj);
           console.log("赚回来", JSON.parse(luj));
-          state.fileList = JSON.parse(luj)
+          state.fileList = JSON.parse(luj);
           // state.fileList = luj
         }
       });
@@ -3379,9 +3383,9 @@ export default {
         //   // list.push(JSON.stringify(item))
         //     state.fileList.push(item)
         // });
-        
-        state.fileList.push(info.file)
-        list = state.fileList
+
+        state.fileList.push(info.file);
+        list = state.fileList;
         console.log("list", list);
         // let str = list.join(",");
         let str = JSON.stringify(list);
@@ -3431,7 +3435,7 @@ export default {
     const toEdit = () => {
       if (state.parentId == "0") {
         routered.push({
-          path: "/manage/projectadd",
+          path: "/projectadd",
           query: {
             projectId: state.projectId,
             name: state.name,
@@ -3440,7 +3444,7 @@ export default {
       } else {
         if (state.isbj !== null) {
           routered.push({
-            path: "/manage/classadd",
+            path: "/classadd",
             query: {
               projectId: state.projectId,
               // name: state.paraentName,
@@ -3450,7 +3454,7 @@ export default {
           });
         } else {
           routered.push({
-            path: "/manage/sonproject",
+            path: "/sonproject",
             query: {
               projectId: state.projectId,
               name: state.name,
@@ -3608,45 +3612,47 @@ export default {
         });
     };
     //删除文件
-    const deFile=(id)=>{
-      console.log(id)
-      let index = state.fileList.findIndex(item=>{item.uid==id})
-      state.fileList.splice(index,1)
-      let str = JSON.stringify(state.fileList)
+    const deFile = (id) => {
+      console.log(id);
+      let index = state.fileList.findIndex((item) => {
+        item.uid == id;
+      });
+      state.fileList.splice(index, 1);
+      let str = JSON.stringify(state.fileList);
       editProj({
-          attach: str,
-          beginTime: state.tstartTime.slice(0, 10),
-          // beginTime:1668643200,
-          boeFlag: state.boeFlag,
-          category: state.category,
-          courseSyncFlag: state.courseSyncFlag,
-          endTime: state.tendTime.slice(0, 10),
-          // endTime: 1668816000,
-          level: state.tlevel,
-          manager: state.manager,
-          managerId: state.managerId,
-          name: state.name,
-          notice: state.notice,
-          noticeFlag: state.noticeFlag,
-          parentId: state.parentId,
-          picUrl: state.picUrl,
-          projectId: state.projectId,
-          remark: state.remark,
-          sourceBelongId: Number(state.tsourceBelong),
-          status: state.status,
-          systemId: state.tsystemId,
-          templateId: state.templateId || 0,
-          type: state.type,
+        attach: str,
+        beginTime: state.tstartTime.slice(0, 10),
+        // beginTime:1668643200,
+        boeFlag: state.boeFlag,
+        category: state.category,
+        courseSyncFlag: state.courseSyncFlag,
+        endTime: state.tendTime.slice(0, 10),
+        // endTime: 1668816000,
+        level: state.tlevel,
+        manager: state.manager,
+        managerId: state.managerId,
+        name: state.name,
+        notice: state.notice,
+        noticeFlag: state.noticeFlag,
+        parentId: state.parentId,
+        picUrl: state.picUrl,
+        projectId: state.projectId,
+        remark: state.remark,
+        sourceBelongId: Number(state.tsourceBelong),
+        status: state.status,
+        systemId: state.tsystemId,
+        templateId: state.templateId || 0,
+        type: state.type,
+      })
+        .then((res) => {
+          console.log("上传成功", res);
+          message.destroy();
+          return message.success("删除成功");
         })
-          .then((res) => {
-            console.log("上传成功", res);
-            message.destroy()
-            return message.success("删除成功")
-          })
-          .catch((err) => {
-            console.log("上传失败了", err);
-          });
-    }
+        .catch((err) => {
+          console.log("上传失败了", err);
+        });
+    };
     onMounted(() => {
       getStu();
       getTaskList();
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index a809d8ee..840388e6 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -138,7 +138,7 @@ export default defineComponent({
                 {value.status === "已发布" ? (
                   <div class="nselect">
                     <div class="ops2">
-                      <router-link to="/manage/libraryadd">
+                      <router-link to="/libraryadd">
                         <div class="jc">
                           查看{" "}
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
@@ -179,7 +179,7 @@ export default defineComponent({
                       </div>
                     </div>
                     <div class="ops2">
-                      <router-link to="/manage/libraryadd">
+                      <router-link to="/libraryadd">
                         <div class="jc">
                           查看
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index a7201aea..60bc59ee 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/manage/libraryAdd"
+        to="/libraryAdd"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -501,7 +501,7 @@ export default {
       storage.remove("projectAddId");
       setTimeout(() => {
         router.push({
-          path: "/manage/libraryAdd",
+          path: "/libraryAdd",
         });
       }, 400);
     };
@@ -950,7 +950,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/projectmanage",
+                  path: "/projectmanage",
                 });
               }, 1000);
             } else {
@@ -1005,7 +1005,7 @@ export default {
               message.success("创建成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/taskpage",
+                  path: "/taskpage",
                   query: { id: res.data.data.projectId },
                 });
               }, 1000);
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 3008b51f..dd7aec0e 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -10,9 +10,9 @@
               导出信息
             </span>
           </div>
-          <router-link to="/manage/researchmanage" class="goback">
+          <router-link to="/researchmanage" class="goback">
             <span class="return"></span>
-            <router-link class="returntext" to="/manage/researchmanage">
+            <router-link class="returntext" to="/researchmanage">
               返回
             </router-link>
           </router-link>
diff --git a/src/views/research/ResearchAdd copy.vue b/src/views/research/ResearchAdd copy.vue
index a8593eed..a9a6c462 100644
--- a/src/views/research/ResearchAdd copy.vue	
+++ b/src/views/research/ResearchAdd copy.vue	
@@ -3,9 +3,9 @@
   <div class="researchadd">
     <div class="header">
       <span class="title">创建评估</span>
-      <router-link to="/manage/researchmanage" class="goback">
+      <router-link to="/researchmanage" class="goback">
         <span class="return"></span>
-        <router-link class="returntext" to="/manage/researchmanage">
+        <router-link class="returntext" to="/researchmanage">
           返回
         </router-link>
       </router-link>
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index d7562fb0..3a97ca47 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -3,9 +3,9 @@
   <div class="researchadd">
     <div class="header">
       <span class="title">创建评估</span>
-      <router-link to="/manage/researchmanage" class="goback">
+      <router-link to="/researchmanage" class="goback">
         <span class="return"></span>
-        <router-link class="returntext" to="/manage/researchmanage">
+        <router-link class="returntext" to="/researchmanage">
           返回
         </router-link>
       </router-link>
@@ -499,7 +499,7 @@ export default {
           if (res.data.code === 200) {
             message.success("编辑成功");
             router.push({
-              path: "/manage/researchmanage",
+              path: "/researchmanage",
             });
           }
         });
@@ -517,7 +517,7 @@ export default {
           if (res.data.code === 200) {
             message.success("创建成功");
             router.push({
-              path: "/manage/researchmanage",
+              path: "/researchmanage",
             });
           }
         });
@@ -526,7 +526,7 @@ export default {
     const handleAllCancel = () => {
       state.allFormsData = [];
       router.push({
-        path: "/manage/researchmanage",
+        path: "/researchmanage",
       });
     };
     const checkVal = (filterData) => {
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 3e972ffd..6e56bc80 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -428,7 +428,7 @@ export default {
                   <div
                     class="jc"
                     onClick={() => {
-                      handleToManagepage(value, "/manage/managepage");
+                      handleToManagepage(value, "/managepage");
                     }}
                   >
                     管理
@@ -474,7 +474,7 @@ export default {
                   <div
                     class="jc"
                     onClick={() => {
-                      handleToResearchadd(value, "/manage/researchadd");
+                      handleToResearchadd(value, "/researchadd");
                     }}
                   >
                     基础信息
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 187f212b..347c9d8b 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -327,7 +327,7 @@ export default {
     };
     const router = useRouter();
     const golearningpath = () => {
-      router.push({ path: "/manage/learningpath", params: { id: 1 } });
+      router.push({ path: "/learningpath", params: { id: 1 } });
     };
 
     //下载二维码图片

From 6bc5991774ba0d1824506ec15ded9d6e8bdd698e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Mon, 21 Nov 2022 18:17:41 +0800
Subject: [PATCH 83/90] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF=E4=BB=BB=E5=8A=A1=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexTemplate.js                |    2 +-
 src/views/projectcenter/LibraryAdd.vue  |  776 +++---
 src/views/projectcenter/temTask.vue     | 3200 +++++++++++++++++++++++
 src/views/projectcenter/templateAdd.vue |  547 +---
 4 files changed, 3674 insertions(+), 851 deletions(-)
 create mode 100644 src/views/projectcenter/temTask.vue

diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js
index a9837852..212aafee 100644
--- a/src/api/indexTemplate.js
+++ b/src/api/indexTemplate.js
@@ -4,7 +4,7 @@ import http from "./config";
 //编辑项目模板
 export const templateEdit = (obj) => http.post('/admin/project/template/edit',obj);
 // 模板详情
-export const templateDetail = (id) => http.get(`/admin/project/template/edit?projectTemplateId=${id}`);
+export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`);
 // 删除阶段
 export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id});
 //删除任务
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 9b6a10ff..f44e4414 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -5,12 +5,11 @@
         <img class="img" src="../../assets/images/projectadd/picture.png" />
       </div>
       <div class="imgfor">
-        <div class="forz">{{ projectInfo.name || "-" }}</div>
+        <div class="forz">{{projectInfo.name || '-'}}</div>
         <div class="fort">
-          <div class="fort1">项目经理：{{ projectInfo.manager || "-" }}</div>
+          <div class="fort1">项目经理：{{projectInfo.manager || '-'}}</div>
           <div class="fort2">
-            起止时间：{{ projectInfo.beginTime || "-" }} 至
-            {{ projectInfo.endTime || "-" }}
+            起止时间：{{projectInfo.beginTime || '-'}} 至 {{projectInfo.endTime || '-'}}
           </div>
         </div>
       </div>
@@ -34,7 +33,7 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/templatelibrary"
+        <router-link to="/manage/templatelibrary"
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
@@ -56,7 +55,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
               <button class="btn" @click="showFaceIn">批量面授报名</button>
-              <router-link to="/taskadd" class="edit">
+              <router-link to="/manage/temTask" class="edit">
                 <img
                   class="editimg"
                   src="../../assets/images/projectadd/edit.png"
@@ -201,7 +200,7 @@
                               : 'none',
                         }"
                       >
-                        <!-- 考勤 -->
+                      <!-- 考勤 -->
                       </div>
                       <div
                         class="operation"
@@ -279,7 +278,7 @@
             <hr color="#E8E8E8" />
             <div class="ntc_body">
               <div class="ntc_switch">
-                <a-switch v-model:checked="checked" @click="changeopclo" />
+                <a-switch v-model:checked="checked" @click="changeopclo"  />
                 <div
                   class="opclo"
                   :style="{ display: hideshow ? 'block' : 'none' }"
@@ -300,7 +299,7 @@
                 <div class="ntcc_tit">公告内容</div>
                 <div class="textarea">
                   <a-textarea
-                    v-model:value="value2"
+                    v-model:value="projectInfo.notice"
                     placeholder="公告信息最多输入150个字。"
                     :maxlength="textnum"
                     allow-clear
@@ -339,6 +338,7 @@
                   </div>
                 </div>
               </div>
+
               <div v-if="edit" class="pjcb_content">
                 <div class="content content1">
                   <span>当前设计下，学员可以获得 </span
@@ -385,98 +385,67 @@
           <div class="split"></div>
           <a-tabs>
             <a-tab-pane key="1" tab="编辑">
-              <div class="setting">
-                <div class="set_tit">
-                  <span>基本信息</span>
-                  <span class="editBtn" @click="toEdit">编辑</span>
-                </div>
-                <hr color="#E8E8E8" />
+              <div class="content7">
+                <!-- <div class="set_tit">
+              <span>基本信息</span>
+            </div> -->
+
+                <!-- <div class="line"></div> -->
                 <div class="set_body">
+                  <!-- <div class="edit" @click="showEditProj">
+                <div class="img"></div>
+                <div class="ed">编辑</div>
+              </div> -->
+                  <div class="edit" @click="toEdit">
+                    <div class="img"></div>
+                    <div class="ed">编辑</div>
+                  </div>
                   <div class="set_content">
-                    <div class="setc_name"><span>模板名称：</span></div>
+                    <div class="setc_name"><span>项目名称：</span></div>
                     <div class="setc_main">
-                      <a-input
-                        v-model:value="formData.name"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 300px"
-                      ></a-input>
+                      <span style="color: #999999">{{ projectInfo.name }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>封面图：</span></div>
                     <div class="setc_main">
-                      <a-upload
-                        v-model:file-list="fileList"
-                        name="file"
-                        action="/api/file/upload"
-                        @change="handleChange"
-                        :disabled="!isEdit"
-                      >
-                        <img
-                          src="@/assets/images/projectadd/picture.png"
-                          alt=""
-                        />
-                      </a-upload>
+                      <img
+                        style="width: 151px; height: 84px"
+                        :src="picUrl"
+                        alt=""
+                      />
                     </div>
                   </div>
                   <div class="set_content">
-                    <div class="setc_name"><span>模板时间：</span></div>
+                    <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
-                      <a-range-picker
-                        v-model:value="formData.time"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                      />
+                      <span style="color: #999999"
+                        >{{ projectInfo.beginTime }} ～ {{ projectInfo.endTime }}</span
+                      >
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目经理：</span></div>
                     <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.manager"
-                        mode="multiple"
-                        placeholder="请选择项目经理"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="managerOptions"
-                      ></a-select>
+                      <span style="color: #999999">{{ projectInfo.manager }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.sourceBelongId"
-                        placeholder="请选择资源归属"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="sourceBelongOptions"
-                      ></a-select>
+                      <span style="color: #999999">{{ projectInfo.sourceBelong }}</span>
                     </div>
                   </div>
                   <div class="set_content">
-                    <div class="setc_name"><span>模板说明：</span></div>
+                    <div class="setc_name"><span>项目说明：</span></div>
                     <div class="setc_main">
-                      <a-input
-                        v-model:value="formData.remark"
-                        style="width: 300px"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                      ></a-input>
+                      <span style="color: #999999">{{ projectInfo.remark }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main" @click="changecheck2">
-                      <a-radio
-                        v-model:checked="formData.courseSyncFlag"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio
@@ -486,116 +455,66 @@
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.level"
-                        placeholder="请选择项目级别"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="levelOptions"
-                      ></a-select>
+                      <span style="color: #999999">{{ projectInfo.level }}</span>
                     </div>
                   </div>
                   <div class="set_content">
-                    <div class="setc_name"><span>培训分类：</span></div>
+                    <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
-                      <a-select
-                        v-model:value="formData.systemId"
-                        placeholder="请选择培训分类"
-                        :size="large"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
-                        style="width: 200px; color: #999999"
-                        :options="systemOptions"
-                      ></a-select>
+                      <span style="color: #999999">{{ projectInfo.systemId }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
-                    <div class="setc_main" @click="changecheck3">
-                      <a-radio
-                        v-model:checked="formData.boeFlag"
-                        :bordered="isEdit"
-                        :disabled="!isEdit"
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.boeFlag"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
-                  <div v-if="isEdit" style="transform: translateX(50%)">
-                    <a-button
-                      @click="cancelEdit"
-                      style="background-color: #f9f9f9"
-                      >取消</a-button
-                    >
-                    <a-button
-                      @click="confirmEdit"
-                      style="background-color: #f5faff"
-                      >保存</a-button
-                    >
-                  </div>
                 </div>
               </div>
             </a-tab-pane>
             <a-tab-pane key="2" tab="共享文档">
               <div class="sametab">
-                <div class="Gcon">
-                  <div class="pad"></div>
-                  <div class="Gin">
-                    <div class="headone" style="transform: translateX(30px)">
-                      <div class="box"></div>
-                      <div class="onetitle">上传共享文档</div>
-                      <div class="oneedi">
-                        <a-switch v-model:checked="docChecked"></a-switch>
-                      </div>
-                    </div>
-                    <div class="btnbox" style="margin: 20px">
-                      <a-upload
-                        v-model:file-list="fileList"
-                        name="file"
-                        action="/api/file/upload"
-                        @change="handleChange"
-                      >
-                        <span
-                          class="xkbtn"
-                          style="cursor: pointer; font-size: 17px"
-                          >上传</span
-                        >
-                        <img
-                          src="@/assets/images/basicinfo/cloud.png"
-                          style="cursor: pointer; width: 34px; height: 34px"
-                          alt=""
-                        />
-                      </a-upload>
-                      <div class="btnbox" style="margin: 20px">
-                        <span style="color: #999999">
-                          支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
-                        </span>
-                      </div>
-                      <div
-                        v-for="item in docList"
-                        :key="item.src"
-                        class="docListStyle"
-                      >
-                        <img
-                          src="@/assets/images/basicinfo/download.png"
-                          style="
-                            cursor: pointer;
-                            width: 40px;
-                            height: 40px;
-                            margin-right: 40px;
-                          "
-                          alt=""
-                        />
-                        <span style="font: oblique 16px Sans-serif">{{
-                          item.name
-                        }}</span>
-                        <span style="color: #4ea6ff; float: right">删除</span>
-                      </div>
+              <div class="Gcon">
+                <div class="pad"></div>
+                <div class="Gin">
+                  <div class="headone" style="transform: translateX(30px)">
+                    <div class="box"></div>
+                    <div class="onetitle">上传共享文档</div>
+                    <div class="oneedi">
+                      <a-switch v-model:checked="docChecked" ></a-switch>
                     </div>
                   </div>
+                  <div class="btnbox" style="margin:20px;">
+                <a-upload
+                  v-model:file-list="fileList"
+                  name="file"
+                  action="/api/file/upload"
+                  @change="handleChange"
+                >
+                  <span class="xkbtn" style="cursor: pointer; font-size: 17px" >上传</span>
+                  <img src="@/assets/images/basicinfo/cloud.png" style="cursor: pointer;
+                  width:34px;height:34px;
+                  " alt="">
+                </a-upload>
+                <div class="btnbox" style="margin:20px;">
+                <span style="color: #999999">
+                  支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
+                </span>
+              </div>
+              <div v-for="item in docList" :key="item.src" class="docListStyle">
+                <img src="@/assets/images/basicinfo/download.png" style="cursor: pointer;
+                  width:40px;height:40px;margin-right:40px;
+                  " alt="">
+                <span style="font: oblique   16px Sans-serif">{{item.name}}</span> 
+                <span style="color: #4ea6ff;float:right;">删除</span>
+              </div>
+              </div>
                 </div>
               </div>
+            </div>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
@@ -640,10 +559,11 @@
     </div>
   </div>
 </template>
+
 <script>
-import { ref, reactive, defineComponent, toRefs, onMounted } from "vue";
+import { ref, reactive, defineComponent, toRefs, onMounted} from "vue";
 import { message } from "ant-design-vue";
-import * as api from "@/api/indexTemplate";
+import * as api from "@/api/indexTemplate"
 import { useRouter } from "vue-router";
 export default defineComponent({
   name: "LibraryAdd",
@@ -728,70 +648,29 @@ export default defineComponent({
             },
           ],
         },
-        {
-          text: "阶段2腾飞班阶段2",
-          children: [
-            {
-              course: "讨论",
-              name: "时间管理",
-              classify: "选修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 20, //完成人数
-              percent: 40,
-            },
-            {
-              course: "测评",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "评估",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "投票",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-          ],
-        },
       ],
       // 模板编辑列表
-      managerOptions: [
-        { value: "李俊国" },
-        { value: "将小米" },
-        { value: "刘孟君" },
+      managerOptions:[
+        { value: "李俊国"},
+        { value: "将小米"},
+        { value: "刘孟君"},
       ],
-      sourceBelongOptions: [
-        { value: "项目一" },
-        { value: "项目二" },
-        { value: "项目三" },
+      sourceBelongOptions:[
+        { value: "项目一"},
+        { value: "项目二"},
+        { value: "项目三"},
       ],
-      levelOptions: [
-        { value: "集团级" },
-        { value: "组织级" },
-        { value: "现地级" },
-        { value: "部门级" },
+      levelOptions:[
+        { value: "集团级"},
+        { value: "组织级"},
+        { value: "现地级"},
+        { value: "部门级"},
       ],
-      systemOptions: [
-        { value: "集团级" },
-        { value: "组织级" },
-        { value: "现地级" },
-        { value: "部门级" },
+      systemOptions:[
+        { value: "集团级"},
+        { value: "组织级"},
+        { value: "现地级"},
+        { value: "部门级"},
       ],
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
@@ -803,7 +682,7 @@ export default defineComponent({
       checked: true,
       checked2: false,
       checked3: false,
-      docChecked: true,
+      docChecked:true,
       value3: false,
       value4: false,
       hideshow: true,
@@ -811,42 +690,37 @@ export default defineComponent({
       score2: 5,
       edit: true,
       // 共享文档列表
-      docList: [
+      docList:[
         {
-          name: "测试文档1.doc",
-          src: "",
+          name:'测试文档1.doc',
+          src:"",
         },
         {
-          name: "测试文档2.doc",
-          src: "",
+          name:'测试文档2.doc',
+          src:"",
         },
         {
-          name: "测试文档3.doc",
-          src: "",
-        },
+          name:'测试文档3.doc',
+          src:"",
+        }
       ],
-      // 基本信息
-      formData: {
-        name: "123",
-        time: "",
-        manager: "建国",
+      isEdit:false, // 是否处于编辑状态
+        // 基本信息
+      projectInfo:{
+        beginTime:null,
+        endTime:null,
+        name: null,
+        manager: null,
+        notice: null,
         sourceBelongId: null,
         remark: "",
         courseSyncFlag: false,
         level: null,
         systemId: null,
         boeFlag: false,
-      },
-      isEdit: false, // 是否处于编辑状态
-      projectInfo: {
-        beginTime: null,
-        endTime: null,
-        name: null,
-        manager: null,
-      },
+      }
     });
     const value = ref("");
-    const value2 = ref("");
     const textnum = "150";
     const routered = useRouter();
     const changeopclo = () => {
@@ -864,186 +738,163 @@ export default defineComponent({
     };
     const confirmEdit = () => {
       state.isEdit = false;
-      editTemplate();
       getDetail();
     };
-    onMounted(() => {
-      getDetail();
-    });
+    const checkType = (type) => {
+      let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
+      ];
+      return typeRules[type];
+    };
+    onMounted(() => {getDetail()});
     // 获取详情
     const getDetail = () => {
-      api
-        .templateDetail(1)
-        .then((res) => {
-          console.log(res);
-          state.formData.name = res.data.data.projectInfo.name;
-          state.formData.time =
-            res.data.data.projectInfo.startTime +
-            res.data.data.projectInfo.endTime;
-          state.formData.manager = res.data.data.projectInfo.manager;
-          state.formData.sourceBelongId =
-            res.data.data.projectInfo.sourceBelongId;
-          state.formData.remark = res.data.data.stageList.remark;
-          state.formData.courseSyncFlag =
-            res.data.data.projectInfo.courseSyncFlag;
-          state.formData.level = res.data.data.projectInfo.level;
-          state.formData.systemId = res.data.data.projectInfo.systemId;
-          state.formData.boeFlag = res.data.data.projectInfo.boeFlag;
-          state.value2 = res.data.data.projectInfo.notice;
-        })
-        .catch((err) => {
-          message.error("操作失败" + err);
-          console.log(err);
-        });
-    };
-    // 编辑项目模板
-    const editTemplate = () => {
-      let obj = {
-        beginTime: state.formData.time,
-        boeFlag: state.formData.boeFlag,
-        category: 0,
-        courseSyncFlag: state.formData.courseSyncFlag,
-        endTime: state.formData.time,
-        level: state.formData.level,
-        manager: state.formData.manager,
-        managerId: "",
-        name: state.formData.name,
-        notice: "",
-        noticeFlag: 0,
-        picUrl: "",
-        projectTemplateId: 0,
-        remark: state.formData.remark,
-        sourceBelongId: state.formData.sourceBelongId,
-        status: 0,
-        systemId: state.formData.systemId,
-      };
-      api
-        .templateEdit(obj)
-        .methods(obj)
-        .then((res) => {
-          message.success("编辑成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("编辑失败" + err);
-          console.log(err);
-        });
-    };
+      api.templateDetail(1).then(res => {
+        state.taskSyllabus = []
+        console.log(res);
+        state.projectInfo.name = res.data.data.projectTemplateInfo.name
+        state.projectInfo.beginTime = res.data.data.projectTemplateInfo.createTime
+        state.projectInfo.manager = res.data.data.projectTemplateInfo.manager
+        state.projectInfo.notice = res.data.data.projectTemplateInfo.notice
+        state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId
+        state.projectInfo.remark = res.data.data.stageList.remark
+        state.projectInfo.courseSyncFlag = res.data.data.projectTemplateInfo.courseSyncFlag
+        state.projectInfo.level = res.data.data.projectTemplateInfo.level
+        state.projectInfo.systemId = res.data.data.projectTemplateInfo.systemId
+        state.projectInfo.boeFlag = res.data.data.projectTemplateInfo.boeFlag
+        state.projectInfo.picUrl = res.data.data.projectTemplateInfo.picUrl
+        let data = res.data.data.stageList;
+        for(let i in data) {
+          state.taskSyllabus.push({text: data[i].name,children:[]});
+          for(let j in data[i].taskList) {
+            state.taskSyllabus[i].children.push({
+              course: checkType(data[i].taskList[j].type),
+              name: data[i].taskList[j].name,
+              classify: data[i].taskList[j].flag,
+              beginTime: "",
+              total: 0, //总人数
+              complete: 0, //完成人数
+              percent: 0,
+            })
+          }
+        }
+      }).catch(err => {
+        message.error("操作失败"+err)
+        console.log(err)
+      })
+    }
+
     // 发布公告
     const addNotice = () => {
       let obj = {
-        beginTime: 0,
-        boeFlag: 0,
-        category: 0,
-        courseSyncFlag: 0,
-        endTime: 0,
-        level: 0,
-        manager: "",
-        managerId: "",
-        name: "",
-        notice: state.value2,
-        noticeFlag: 0,
-        picUrl: "",
-        projectTemplateId: 0,
-        remark: "",
-        sourceBelongId: 0,
-        status: 0,
-        systemId: 0,
+        "beginTime": 0,
+        "boeFlag": 0,
+        "category": 0,
+        "courseSyncFlag": 0,
+        "endTime": 0,
+        "level": 0,
+        "manager": "",
+        "managerId": "",
+        "name": "",
+        "notice": state.projectInfo.notice,
+        "noticeFlag": 0,
+        "picUrl": "",
+        "projectTemplateId": 0,
+        "remark": "",
+        "sourceBelongId": 0,
+        "status": 0,
+        "systemId": 0
       };
-      api
-        .templateEdit(obj)
-        .methods(obj)
-        .then((res) => {
-          message.success("公告发布成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("公告发布失败" + err);
-          console.log(err);
-        });
-    };
+      api.templateEdit(obj).methods(obj).then(res => {
+        message.success("公告发布成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("公告发布失败"+err)
+        console.log(err)
+      })
+    }
     // 删除阶段
     const stateDel = (id) => {
-      api
-        .deleteStage(id)
-        .then((res) => {
-          message.success("删除阶段成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("删除阶段失败" + err);
-          console.log(err);
-        });
-    };
-
+      api.deleteStage(id).then(res => {
+        message.success("删除阶段成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("删除阶段失败"+err)
+        console.log(err)
+      })
+    }
+    
     // 删除任务
     const taskDel = (id) => {
-      api
-        .deleteTask(id)
-        .then((res) => {
-          message.success("删除任务成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("删除任务失败" + err);
-          console.log(err);
-        });
-    };
+      api.deleteTask(id).then(res => {
+      message.success("删除任务成功")
+      console.log(res)
+    }).catch(err => {
+      message.error("删除任务失败"+err)
+      console.log(err)
+    })
+    }
     const toEdit = () => {
       routered.push({
-        path: "/templateAdd",
-        query: {
-          projectId: state.projectId,
-          name: state.name,
-        },
-      });
-    };
-    // 新建或编辑阶段
-    const stateEdit = () => {
-      let obj = {
-        name: "",
-        projectTemplateId: 0,
-        remark: "",
-        stageId: 0,
-      };
-      api
-        .editStagek(obj)
-        .then((res) => {
-          message.success("编辑阶段成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("编辑阶段失败" + err);
-          console.log(err);
+          path: "/manage/templateAdd",
+          query: {
+            projectId: state.projectId,
+            name: state.name,
+          },
         });
-    };
+    }
+    
+    // 新建或编辑阶段 
+    const stateEdit = () => {
+      let obj={
+        "name": "",
+        "projectTemplateId": 0,
+        "remark": "",
+        "stageId": 0
+      }
+      api.editStagek(obj).then(res => {
+        message.success("编辑阶段成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑阶段失败"+err)
+        console.log(err)
+      })
+    }
     //新建或编辑阶段任务
     const taskEdit = () => {
       let obj = {
-        courseId: 0,
-        duration: 0,
-        flag: true,
-        name: "",
-        projectTaskId: 0,
-        projectTemplateId: 0,
-        stageId: 0,
-        type: 0,
-      };
-      api
-        .editTask(obj)
-        .then((res) => {
-          message.success("编辑任务成功");
-          console.log(res);
-        })
-        .catch((err) => {
-          message.error("编辑任务失败" + err);
-          console.log(err);
-        });
-    };
+        "courseId": 0,
+        "duration": 0,
+        "flag": true,
+        "name": "",
+        "projectTaskId": 0,
+        "projectTemplateId": 0,
+        "stageId": 0,
+        "type": 0
+      }
+      api.editTask(obj).then(res => {
+        message.success("编辑任务成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑任务失败"+err)
+        console.log(err)
+      })
+    }
     return {
       ...toRefs(state),
       value,
-      value2,
       textnum,
       changeopclo,
       changecheck2,
@@ -1067,18 +918,86 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.content7 {
+    margin-top: 20px;
+
+    .set_tit {
+      margin-left: 34px;
+      font-size: 18px;
+      font-weight: 500;
+      color: #232425;
+    }
+
+    .line {
+      width: 100%;
+      height: 1px;
+      background-color: #e8e8e8;
+      margin-top: 10px;
+    }
+
+    .set_body {
+      margin-left: 34px;
+      margin-right: 34px;
+      position: relative;
+
+      .edit {
+        position: absolute;
+        width: 100px;
+        height: 40px;
+        background: #388be1;
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        right: 0;
+        cursor: pointer;
+
+        .img {
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/edit.png);
+          background-size: 100%;
+          margin-right: 7px;
+        }
+
+        .ed {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+        }
+      }
+
+      .set_content {
+        margin: 32px auto;
+        display: flex;
+
+        // justify-content: end;
+        .setc_name {
+          width: 150px;
+          display: flex;
+          justify-content: end;
+        }
+
+        .setc_main {
+          flex: 1;
+          margin-left: 12px;
+        }
+      }
+    }
+  }
 .editBtn {
-  float: right;
-  margin-right: 150px;
-  color: #4ea6ff;
-  cursor: pointer;
-}
+      float:right; 
+      margin-right: 150px;
+      color:#4ea6ff;
+      cursor: pointer;
+    }
 .clearfix:before,
 .clearfix:after {
   content: " ";
   display: block;
   clear: both;
 }
+
 .addwrapper {
   width: 100%;
   height: 100%;
@@ -1114,7 +1033,7 @@ export default defineComponent({
         margin-top: 20px;
       }
     }
-
+    
     @media screen and (max-width: 1030px) {
       .imgfor {
         margin-left: 20px;
@@ -1239,16 +1158,17 @@ export default defineComponent({
       margin-left: 30px;
       margin-top: 10px;
     }
+
     .split {
-      width: 100%;
-      height: 20px;
-      background-color: #edf0f5;
-    }
-    .docListStyle {
-      display: flex;
-      width: 300px !important;
-      justify-content: space-around;
-    }
+        width: 100%;
+        height: 20px;
+        background-color: #edf0f5;
+      }
+      .docListStyle {
+        display: flex;
+        width: 300px !important;
+        justify-content: space-around;
+      }
     .taskBox {
       .onerow {
         //width: 100%;
@@ -1307,11 +1227,13 @@ export default defineComponent({
       .taskSyllabus {
         // flex: 1;
         overflow-x: auto;
+
         .ant-collapse {
           border: 0px;
           background-color: rgba(255, 255, 255, 0);
           min-width: 1040px;
         }
+
         .ant-collapse-content > .ant-collapse-content-box {
           padding-top: 0px;
           padding-bottom: 0px;
@@ -1343,11 +1265,13 @@ export default defineComponent({
         //width: 100%;
         flex-shrink: 0;
         margin-right: 24px;
+
         display: flex;
         flex-wrap: wrap;
         align-items: center;
         padding: 25px 0px;
         margin-left: 22px;
+
         //margin: 0 12px;
         border: 1px solid #f2f6fc;
         border-top: 0px;
@@ -1359,6 +1283,7 @@ export default defineComponent({
           //height: 71px;
           margin-left: 12px;
           margin-right: 50px;
+
           .iconame {
             //position: absolute;
             color: #4f5156;
@@ -1470,13 +1395,16 @@ export default defineComponent({
         }
       }
     }
+
     .notice {
+      
       .ntc_tit {
-        padding-top: 22px;
+        padding-top:22px;
         margin-left: 34px;
         font-size: 18px;
         font-weight: 500;
         color: #232425;
+        
       }
       .ntc_body {
         margin-left: 34px;
@@ -1498,6 +1426,7 @@ export default defineComponent({
             .btnarea {
               display: flex;
               justify-content: flex-end;
+              
             }
             .area_btn {
               width: 100px;
@@ -1530,8 +1459,9 @@ export default defineComponent({
         }
       }
     }
+
     .projectscore {
-      padding-top: 22px;
+      padding-top:22px;
       .pjc_tit {
         margin-left: 34px;
         font-size: 18px;
@@ -1541,6 +1471,7 @@ export default defineComponent({
       .pjc_body {
         margin-left: 34px;
         margin-right: 34px;
+
         .groupright {
           display: flex;
           justify-content: space-between;
@@ -1607,8 +1538,9 @@ export default defineComponent({
         }
       }
     }
+
     .setting {
-      padding-top: 22px;
+      padding-top:22px;
       .set_tit {
         margin-left: 34px;
         font-size: 18px;
@@ -1636,4 +1568,4 @@ export default defineComponent({
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
new file mode 100644
index 00000000..df5be070
--- /dev/null
+++ b/src/views/projectcenter/temTask.vue
@@ -0,0 +1,3200 @@
+<template>
+    <div class="taskadd">
+      <div style="display: flex">
+        <div class="left clearfix">
+          <div class="leftmain">
+            <div class="tit">
+              阶段<img
+                src="../../assets/images/projectadd/right.png"
+                style="margin-left: 10px; cursor: pointer"
+                @click="showCancel"
+              />
+            </div>
+            <!-- @click="showModal" -->
+            <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
+              <div class="search"></div>
+              <div class="btnText">添加阶段</div>
+            </div>
+            <div class="maincon" style="background-color: #fff">
+              <!-- <div
+              class="items"
+              :class="{ active: isActive == true }"
+              @click="changebgc"
+              v-for="item in level"
+              :key="item.id"
+            > -->
+  
+              <draggable
+                v-model="level"
+                chosenClass="chosen"
+                ghostClass="ghost"
+                forceFallback="true"
+                group="stage"
+                animation="500"
+              >
+                <template #item="{ element }">
+                  <div
+                    class="items"
+                    :class="chooseStageId == element.id ? 'active' : ''"
+                    @click="changebgc(element.id)"
+                  >
+                    <div class="items1">
+                      <div class="boxs_left">
+                        <a-popover placement="topLeft" trigger="click">
+                          <template #content>
+                            <div style="width: 130px">
+                              {{ element.name ? element.name : "暂无说明" }}
+                            </div>
+                          </template>
+                          <template #title>
+                            <span>阶段说明</span>
+                          </template>
+                          <div class="script">
+                            <span style="font-size: 12px; color: #ffffff"
+                              >说明</span
+                            >
+                          </div>
+                        </a-popover>
+  
+                        <div class="imgIcon" @click="showModal(element)"></div>
+                      </div>
+                      <div class="boxs_right">
+                        <div
+                          class="imgIcon"
+                          @click="showDeleteStage(element.id)"
+                        ></div>
+                      </div>
+                    </div>
+                    <div class="items2">
+                      <a-popover
+                        placement="topLeft"
+                        v-if="element.tit.length > 10"
+                      >
+                        <template #content>
+                          <div style="width: 130px">
+                            {{ element.tit }}
+                          </div>
+                        </template>
+                        <!-- <template #title>
+                          <span>关卡说明</span>
+                        </template> -->
+                        <div class="nname">
+                          {{ element.tit }}
+                        </div>
+                      </a-popover>
+                      <div class="nname" v-if="element.tit.length <= 10">
+                        {{ element.tit }}
+                      </div>
+                    </div>
+                    <!-- <div class="itemle">
+                <div class="tit">{{ item.remark }}</div>
+                <div class="name">{{ item.name }}</div>
+              </div> -->
+                  </div>
+                </template>
+              </draggable>
+  
+              <!-- <div
+              class="items"
+              :class="isactive == index ? 'active' : ''"
+              @click="changebgc(index)"
+              v-for="(item, index) in level"
+              :key="item.chapterId"
+            >
+              <div class="items1">
+                <div class="boxs_left">
+                  <div class="script">
+                    <span style="font-size: 12px; color: #ffffff">说明</span>
+                  </div>
+                  <div class="imgIcon"></div>
+                </div>
+                <div class="boxs_right">
+                  <div class="imgIcon"></div>
+                </div>
+              </div>
+              <div class="items2">
+                <div class="nname">{{ item.name }}</div>
+              </div>
+            </div> -->
+            </div>
+          </div>
+        </div>
+        <div class="right">
+          <div class="addhead">
+            <div class="filt">
+              <div class="le">
+                <div class="leftimg">
+                  <img class="img" :src="picUrl" />
+                </div>
+                <div class="imgfor">
+                  <div class="forz" style="font-weight: 700">
+                    {{ projectTitle }}
+                  </div>
+                </div>
+              </div>
+              <div class="rightt">
+                <div class="select">
+                  <span>学习模式：</span>
+                  <div class="inputbox">
+                    <input type="text" placeholder="按学习时间解锁" />
+                    <!-- v-model:unlockModeVisible="unlockModeVisible" -->
+                    <div class="bottonbox" @click="showModeVisible">
+                      <div class="btnText">切换模式</div>
+                    </div>
+                    <!-- 切换模式抽屉 -->
+                    <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
+                  </div>
+                </div>
+                <div class="line"></div>
+                <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
+              <div class="pub">保存</div>
+              <div class="line"></div> -->
+                <router-link to="/manage/taskpage">
+                  <div style="display: flex">
+                    <img
+                      class="img2"
+                      src="../../assets/images/leveladd/back.png"
+                    />
+                    <div class="return">返回</div>
+                  </div>
+                </router-link>
+              </div>
+            </div>
+          </div>
+          <div class="mid">
+            <div class="item" @click="showDrawerOnline">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/zai.png" />
+                </div>
+                <div class="text">在线</div>
+              </div>
+              <!-- 添加在线侧弹窗 -->
+              <div>
+                <add-online
+                  v-model:addonlineVisible="addonlinevisible"
+                  @changeData="updateTableData"
+                  :isLevel="isLevel"
+                  v-model:edit="edit"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:EditOnlineId="EditOnlineId"
+                />
+              </div>
+              <!-- 添加在线侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerFaceteach">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/mian.png" />
+                </div>
+                <div class="text">面授</div>
+              </div>
+              <!-- 添加面授侧弹窗 -->
+              <div>
+                <add-faceteach
+                  v-model:addfaceteachVisible="addfaceteachvisible"
+                  v-model:EditEvalId="EditEvalId"
+                />
+              </div>
+              <!-- 添加面授侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddCase">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/an.png" />
+                </div>
+                <div class="text">案例</div>
+              </div>
+              <!-- 添加案例侧弹窗 -->
+              <div>
+                <add-case
+                  v-model:addcaseVisible="addcasevisible"
+                  @changeData="updateTableData"
+                  :isLevel="isLevel"
+                  v-model:edit="edit"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:EditCaseId="EditCaseId"
+                />
+              </div>
+              <!-- 添加案例侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item">
+              <div class="itcon">
+                <div class="img" @click="showDrawerAddHomework">
+                  <img src="../../assets/images/leveladd/zuo.png" />
+                </div>
+                <div class="text">作业</div>
+              </div>
+              <!-- 添加作业侧弹窗 -->
+              <div>
+                <add-homework
+                  v-model:addhomeworkVisible="addhomeworkvisible"
+                  @changeData="updateTableData"
+                  v-model:isLevel="isLevel"
+                  v-model:edit="edit"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditWorkId="EditWorkId"
+                  v-model:projectTaskId="projectTaskId"
+                />
+              </div>
+              <!-- 添加作业侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddTest">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/kao.png" />
+                </div>
+                <div class="text">考试</div>
+              </div>
+              <!-- 添加考试侧弹窗 -->
+              <div>
+                <add-test
+                  v-model:addtestVisible="addtestvisible"
+                  @changeData="updateTableData"
+                  :isLevel="isLevel"
+                  v-model:edit="edit"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditTestId="EditTestId"
+                  v-model:projectTaskId="projectTaskId"
+                />
+              </div>
+              <!-- 添加考试侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddLive">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/zhi.png" />
+                </div>
+                <div class="text">直播</div>
+              </div>
+              <!-- 添加直播侧弹窗 -->
+              <div>
+                <add-live
+                  v-model:addliveVisible="addlivevisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:edit="edit"
+                  v-model:EditLiveId="EditLiveId"
+                  v-model:projectTaskId="projectTaskId"
+                />
+              </div>
+              <!-- 添加直播侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddRef">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/wai.png" />
+                </div>
+                <div class="text">外链</div>
+              </div>
+              <!-- 添加外链侧弹窗 -->
+              <div>
+                <add-ref
+                  v-model:addrefVisible="addrefvisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:edit="edit"
+                  v-model:EditRefId="EditRefId"
+                  v-model:projectTaskId="projectTaskId"
+                />
+              </div>
+              <!-- 添加外链侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddDiscuss">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/tao.png" />
+                </div>
+                <div class="text">讨论</div>
+              </div>
+              <!-- 添加讨论侧弹窗 -->
+              <div>
+                <add-discuss
+                  v-model:adddiscussVisible="adddiscussvisible"
+                  v-model:edit="edit"
+                  :isLevel="isLevel"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditDiscussId="EditDiscussId"
+                  v-model:projectTaskId="projectTaskId"
+                  @changeData="updateTableData"
+                />
+              </div>
+              <!-- 添加讨论侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddActive">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/huo.png" />
+                </div>
+                <div class="text">活动</div>
+              </div>
+              <!-- 添加活动侧弹窗 -->
+              <div>
+                <add-active
+                  v-model:addactiveVisible="addactivevisible"
+                  v-model:projectId="projectId"
+                  v-model:EditActiveId="EditActiveId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:edit="edit"
+                  :isLevel="isLevel"
+                  v-model:chooseStageId="chooseStageId"
+                  @changeData="updateTableData"
+                />
+              </div>
+              <!-- 添加活动侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddEval">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/ce.png" />
+                </div>
+                <div class="text">测评</div>
+              </div>
+              <!-- 添加测评侧弹窗 -->
+              <div>
+                <add-eval
+                  v-model:addevalVisible="addevalvisible"
+                  @changeData="updateTableData"
+                  v-model:edit="edit"
+                  :isLevel="isLevel"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:EditEvalId="EditEvalId"
+                />
+              </div>
+              <!-- 添加测评侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddInvist">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/diao.png" />
+                </div>
+                <div class="text">评估</div>
+              </div>
+              <!-- 添加评估侧弹窗 -->
+              <div>
+                <add-invist
+                  v-model:addinvistVisible="addinvistvisible"
+                  @changeData="updateTableData"
+                  v-model:edit="edit"
+                  :isLevel="isLevel"
+                  v-model:projectId="projectId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:projectTaskId="projectTaskId"
+                  v-model:EditInvistId="EditInvistId"
+                />
+              </div>
+              <!-- 添加评估侧弹窗 -->
+              <div class="lin"></div>
+            </div>
+            <div class="item" @click="showDrawerAddVote">
+              <div class="itcon">
+                <div class="img">
+                  <img src="../../assets/images/leveladd/tou.png" />
+                </div>
+                <div class="text">投票</div>
+                <!-- 添加投票侧弹窗 -->
+                <div>
+                  <add-vote
+                    v-model:addvoteVisible="addvotevisible"
+                    @changeData="updateTableData"
+                    @getData="changeVData"
+                    v-model:edit="edit"
+                    :isLevel="isLevel"
+                    v-model:projectId="projectId"
+                    v-model:chooseStageId="chooseStageId"
+                    v-model:projectTaskId="projectTaskId"
+                    v-model:EditVoteId="EditVoteId"
+                    v-model:voteId="voteId"
+                    v-model:ballotId="ballotId"
+                  />
+                </div>
+                <!-- 添加投票侧弹窗 -->
+              </div>
+            </div>
+          </div>
+          <div class="boom">
+            <div class="boomcen">
+              <div class="onerow">
+                <div class="taskmain">任务列表</div>
+                <button class="btn" @click="showChangeModal">
+                  移动任务到阶段
+                </button>
+                <div class="edit" @click="showdeAll">
+                  <img
+                    class="editimg"
+                    src="../../assets/images/projectadd/delete.png"
+                  />
+                  <span class="editext">批量删除</span>
+                </div>
+              </div>
+              <!-- 无数据样式 -->
+              <div class="notable" style="display: none">
+                <div class="notablebox">
+                  <div class="boxbody">
+                    <div class="boximg"></div>
+                    <div class="boxtitle">
+                      <span style="color: #ffb64e; font-size: 20px">无课程</span>
+                    </div>
+                    <div class="boxtitle2">
+                      <span style="color: #878b92">请点击新建开课，创建课程</span>
+                    </div>
+                  </div>
+                  <div class="smallleft"></div>
+                  <div class="smallright"></div>
+                </div>
+              </div>
+              <div class="rwbox">
+                <!-- <div class="talk">
+                <img class="im" src="../../assets/images/leveladd/gan.png" />
+                <div class="xu">
+                  <span class="yi">已选择</span>
+                  <div style="width: 5px; display: inline-block"></div>
+                  <span class="th">3</span>
+                  <div style="width: 5px; display: inline-block"></div>
+                  <span class="yi">项</span>
+                  <span class="zon">任务总数：</span>
+                  <span class="yi">5</span>
+                  <span class="yi">条</span>
+                </div>
+              </div> -->
+                <div class="tableBox" style="border: 1px solid #f2f6fc">
+                  <div
+                    style="
+                      height: 50px;
+                      display: flex;
+                      justify-content: space-between;
+                      align-items: center;
+                      background-color: #eff4fc;
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #999ba3;
+                      line-height: 36px;
+                      border-bottom: 1px solid #f2f6fc;
+                    "
+                  >
+                    <div
+                      style="
+                        width: 87px;
+                        text-align: center;
+                        display: flex;
+                        margin-left: 46px;
+                      "
+                    >
+                      <img
+                        style="
+                          width: 16px;
+                          height: 16px;
+                          cursor: pointer;
+                          margin-top: 12px;
+                        "
+                        :src="
+                          selectAll === 0
+                            ? require('../../assets/images/notSelect.png')
+                            : selectAll === 1
+                            ? require('../../assets/images/selectAll.png')
+                            : require('../../assets/images/select.png')
+                        "
+                        @click="selectRowAll"
+                      />
+                      <!-- <a-checkbox
+                      v-model:checked="selectAll"
+                      @change="selectRowAll"
+                    >
+                    </a-checkbox> -->
+                      <div style="margin-top: 2px; margin-left: 8px">类型</div>
+                    </div>
+                    <div style="width: 120px; text-align: center">任务名称</div>
+                    <div style="width: 120px; text-align: center">必修/选修</div>
+                    <div style="width: 87px; text-align: center">时长</div>
+                    <div
+                      style="width: 120px; text-align: center; margin-right: 20px"
+                    >
+                      操作
+                    </div>
+                  </div>
+                  <draggable
+                    v-model="tableData"
+                    chosenClass="chosen"
+                    ghostClass="ghost"
+                    forceFallback="true"
+                    group="task"
+                    animation="500"
+                    @start="onStart"
+                    @end="onEnd"
+                  >
+                    <template #item="{ element }">
+                      <div
+                        style="
+                          height: 50px;
+                          display: flex;
+                          justify-content: space-between;
+                          align-items: center;
+                          border-bottom: 1px solid #f2f6fc;
+                          font-size: 14px;
+                          font-weight: 400;
+                          color: #4f5156;
+                          line-height: 36px;
+                        "
+                        class="tableRow"
+                      >
+                        <div
+                          style="
+                            width: 87px;
+                            text-align: center;
+                            margin-left: 46px;
+                            position: relative;
+                          "
+                        >
+                          <div class="racona">
+                            <div
+                              class="img"
+                              style="
+                                cursor: pointer;
+                                margin-top: 2px;
+                                margin-right: 9px;
+                                position: absolute;
+                                left: -25px;
+                              "
+                            ></div>
+                            <a-checkbox
+                              :id="element.id"
+                              v-model:checked="element.checked"
+                              @change="changeRow"
+                            >
+                            </a-checkbox>
+                            <div style="margin-top: 2px; margin-left: 8px">
+                              {{ element.lei }}
+                            </div>
+                          </div>
+                        </div>
+                        <div style="width: 120px; text-align: center">
+                          {{ element.creater }}
+                        </div>
+                        <div style="width: 120px; text-align: center">
+                          <div class="opat">
+                            <div class="opacationt clearfix">
+                              <a-switch
+                                style="margin-left: -50px; margin-top: 3px"
+                                v-model:checked="element.checked1"
+                                size="small"
+                                active-color="red"
+                                @click="changeCourseType(element)"
+                              />
+                              <div class="showt clearfix">
+                                <div
+                                  class="bi"
+                                  :style="{
+                                    'z-index': element.checked1 ? 999 : 998,
+                                  }"
+                                >
+                                  必修
+                                </div>
+                                <div class="xuan">选修</div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <div style="width: 87px; text-align: center">
+                          {{ element.cretime }}分钟
+                        </div>
+                        <div
+                          style="
+                            width: 120px;
+                            text-align: center;
+                            margin-right: 20px;
+                          "
+                        >
+                          <div class="opa">
+                            <div class="opacation">
+                              <span
+                                style="
+                                  color: #4ea6ff;
+                                  margin-right: 25px;
+                                  cursor: pointer;
+                                "
+                                @click="
+                                  decideType(
+                                    element.lei,
+                                    element.courseId,
+                                    element.id
+                                  )
+                                "
+                              >
+                                编辑
+                              </span>
+                              <span
+                                style="color: #4ea6ff; cursor: pointer"
+                                @click="showDelete(element.id)"
+                              >
+                                删除
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </template>
+                  </draggable>
+                  <!-- <a-table
+                  style="border: 1px solid #f2f6fe"
+                  :columns="tableDataFunc()"
+                  :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
+                    showSizeChanger="true"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="pageSize"
+                    :current="currentPage"
+                    :total="tableDataTotal"
+                    class="pagination"
+                  />
+                </div> -->
+                </div>
+              </div>
+  
+              <!-- 编辑在线侧弹窗 -->
+              <div>
+                <edit-online v-model:editonlineVisible="editonlinevisible" />
+              </div>
+              <!-- 编辑在线侧弹窗 -->
+            </div>
+          </div>
+        </div>
+      </div>
+  
+      <div class="footbtn">
+        <div class="btnbox">
+          <div class="btn btn2">
+            <div class="btnText">暂存</div>
+          </div>
+          <div class="btn btn2">
+            <div class="btnText">确定</div>
+          </div>
+          <div class="btn btn1">
+            <div class="btnText">取消</div>
+          </div>
+        </div>
+      </div>
+  
+      <!-- 添加阶段弹窗 -->
+      <div>
+        <a-modal
+          v-model:visible="stage"
+          :title="null"
+          @ok="closeModal"
+          :footer="null"
+          :closable="false"
+          wrapClassName="addstage"
+          width="624px"
+          height="388px"
+          centered="true"
+          @cancel="closeModal"
+        >
+          <div
+            class="modalHeader"
+            style="
+              width: 100%;
+              height: 68px;
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+            "
+          >
+            <div class="headerLeft" style="margin-left: 32px">
+              <span class="headerLeftText" style="font-size: 16px"
+                >编辑/添加阶段</span
+              >
+            </div>
+            <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
+              <img
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
+              />
+            </div>
+          </div>
+          <div class="modalMain" style="width: 100%">
+            <div class="name">
+              <div class="namebox">
+                <div>
+                  <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                </div>
+                <div class="inname">阶段名称：</div>
+              </div>
+              <div class="in">
+                <a-input
+                  v-model:value="valuesname"
+                  show-count
+                  :maxlength="20"
+                  placeholder="请输入阶段名称"
+                />
+              </div>
+            </div>
+            <div class="name" style="display: flex; align-items: flex-start">
+              <div class="namebox">
+                <div class="inname">阶段说明：</div>
+              </div>
+              <div class="intext" style="margin-left: 14px">
+                <a-textarea
+                  v-model:value="valuesnotice"
+                  style="height: 88px"
+                  show-count
+                  :maxlength="100"
+                  placeholder="请输入阶段说明"
+                />
+              </div>
+            </div>
+            <div
+              style="
+                display: flex;
+                width: 100%;
+                justify-content: center;
+                margin-top: 40px;
+              "
+            >
+              <button
+                @click="closeModal"
+                style="
+                  cursor: pointer;
+                  height: 40px;
+                  width: 100px;
+                  border: 1px solid #409eff;
+                  border-radius: 4px;
+                  color: #409eff;
+                  background-color: #ffffff;
+                "
+              >
+                取消
+              </button>
+              <button
+                @click="editStage"
+                style="
+                  cursor: pointer;
+                  margin-left: 16px;
+                  margin-bottom: 40px;
+                  height: 40px;
+                  width: 100px;
+                  border: 1px solid #409eff;
+                  border-radius: 4px;
+                  color: #ffffff;
+                  background-color: #409eff;
+                "
+              >
+                确定
+              </button>
+            </div>
+          </div>
+        </a-modal>
+      </div>
+      <!-- 确认添加阶段弹窗 -->
+      <a-modal
+        v-model:visible="confirmModal"
+        :footer="null"
+        :closable="cC"
+        wrapClassName="ConfirmModal"
+        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="closeConfirm"></div>
+            </div>
+            <div class="body">
+              <span>您确定要添加阶段吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1" @click="closeConfirm">
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="showModal">
+                <div class="btnText">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <!-- 确认取消阶段弹窗 -->
+      <a-modal
+        v-model:visible="cancelModal"
+        :footer="null"
+        :closable="cC"
+        wrapClassName="ConfirmModal"
+        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="closeCancel"></div>
+            </div>
+            <div class="body">
+              <span>您确定要取消阶段吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="delete_exit">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="showModal">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <!-- 确认删除任务弹窗 -->
+      <a-modal
+        v-model:visible="deleteModal"
+        :footer="null"
+        :closable="cC"
+        wrapClassName="ConfirmModal"
+        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="closeDelete"></div>
+            </div>
+            <div class="body">
+              <span>您确定要删除此任务吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="delete_exit">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="showModal1">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <a-modal
+        v-model:visible="deAll"
+        :footer="null"
+        :closable="cC"
+        wrapClassName="ConfirmModal"
+        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="closeDeAll"></div>
+            </div>
+            <div class="body">
+              <span>您确定要批量删除任务吗</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1">
+                <div class="btnText" @click="closeDeAll">取消</div>
+              </div>
+              <div class="del_btn btn2">
+                <div class="btnText" @click="deleteTaskAll">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+      <!-- 移动任务到阶段 -->
+      <a-modal
+        style="padding: 0"
+        :closable="sh"
+        v-model:visible="visiblene"
+        :footer="null"
+        centered="true"
+        wrapClassName="moveModal"
+      >
+        <div class="con">
+          <div class="header">
+            <div class="inhe">
+              <div class="mod"></div>
+              <div class="tz">选择任务移动到阶段</div>
+            </div>
+          </div>
+          <div class="mid">
+            <div class="inher">
+              <div class="cur">已选中{{ selectRow.length }}个任务</div>
+              <div class="select">
+                <a-select
+                  v-model:value="curLevel"
+                  style="width: 100%"
+                  placeholder="请选择阶段"
+                  :options="level"
+                  @change="handleChangeStage"
+                  allowClear
+                  showSearch
+                ></a-select>
+              </div>
+              <div class="btn">
+                <button
+                  style="cursor: pointer"
+                  class="sameb btn1"
+                  @click="closeChangeModal"
+                >
+                  取消
+                </button>
+                <button
+                  style="cursor: pointer"
+                  class="sameb btn2"
+                  @click="moveTask"
+                >
+                  确定
+                </button>
+              </div>
+            </div>
+          </div>
+        </div></a-modal
+      >
+  
+      <!-- 是否删除阶段弹窗 -->
+      <a-modal
+        v-model:visible="deleteStageModal"
+        :footer="null"
+        :closable="cC"
+        wrapClassName="ConfirmModal"
+        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="closeDeleteStage"></div>
+            </div>
+            <div class="body">
+              <span>您确定要删除此阶段</span>
+            </div>
+            <div class="del_btnbox">
+              <div class="del_btn btn1" @click="closeDeleteStage">
+                <div class="btnText">取消</div>
+              </div>
+              <div class="del_btn btn2" @click="deleteStage">
+                <div class="btnText">确定</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+  </template>
+  
+  <script>
+  import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
+  import AddOnline from "../../components/drawers/AddOnline.vue";
+  import EditOnline from "../../components/drawers/EditOnline.vue";
+  import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
+  import AddCase from "../../components/drawers/AddCase.vue";
+  import AddHomework from "../../components/drawers/AddHomework.vue";
+  import AddTest from "../../components/drawers/AddTest.vue";
+  import AddLive from "../../components/drawers/AddLive.vue";
+  import AddRef from "../../components/drawers/AddRef.vue";
+  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 { message } from "ant-design-vue";
+  import * as api from "../../api/indexTaskadd";
+  import * as apistage from "../../api/indexStage";
+  import * as apimove from "../../api/indexMovetask";
+  import draggable from "vuedraggable";
+  import { storage } from "../../api/storage";
+  import UnlockMode from "../../components/drawers/UnlockMode.vue";
+  // import * as api1 from "../../api/index1";
+  
+  const drawercolumns = [
+    {
+      title: "项目名称",
+      dataIndex: "projectName",
+      key: "projectName",
+      width: 200,
+      // align: "center",
+      ellipsis: true,
+      // scopedSlots: { customRender: "action" }, //引入的插槽
+      // customRender: (text, record) => {
+      //   console.log(text, record);
+      //   return <span>{text.text}</span>;
+      // },
+    },
+    {
+      title: "项目经理",
+      dataIndex: "manager",
+      key: "manager",
+      width: 100,
+      align: "center",
+    },
+  
+    {
+      title: "创建人",
+      dataIndex: "creater",
+      // width: "30%",
+      key: "creater",
+      width: 100,
+      align: "center",
+    },
+    {
+      title: "创建时间",
+      dataIndex: "time",
+      key: "time",
+      width: 180,
+      align: "center",
+    },
+  ];
+  export default {
+    name: "TaskAdd",
+    components: {
+      draggable,
+      AddOnline,
+      EditOnline,
+      AddFaceteach,
+      AddCase,
+      AddHomework,
+      AddTest,
+      AddLive,
+      AddRef,
+      AddDiscuss,
+      AddActive,
+      AddEval,
+      AddInvist,
+      AddVote,
+      UnlockMode,
+    },
+    setup() {
+      const state = reactive({
+        projectId: storage.get("projectId")
+          ? JSON.parse(storage.get("projectId"))
+          : null,
+        chooseStageId: null,
+        removeStageId: null,
+        edit: false,
+        isLevel: 2, //学习路径1项目2模板库3
+        // isRefEdit: 1, //外链编辑
+        // isLiveEdit: 1, //直播编辑
+        isRefEdit: false, //外链编辑
+        isLiveEdit: false, //直播编辑
+        EditRefId: null, //要编辑的外链的id
+        EditLiveId: null, //要编辑的直播的ids
+        deAll: false,
+        EditDiscussId: null, //要编辑的讨论的id
+        EditActiveId: null, //要编辑的活动id
+        EditWorkId: null, // 要编辑的作业id
+        EditTestId: null, // 要编辑的考试id
+        EditCaseId: null, //要编辑的案例id
+        EditOnlineId: null, //要编辑的在线id
+        EditFaceTeach: null,
+        EditEvalId: null,
+        EditInvistId: null,
+        EditVoteId: null, //编辑需要投票的id
+        ballotId: "", //编辑需要的题干id
+        projectTaskId: null, // 要编辑的具体任务id
+        projectNameList: [
+          {
+            id: 1,
+            value: "项目一",
+            label: "项目一",
+          },
+          {
+            id: 2,
+            value: "项目二",
+            label: "项目二",
+          },
+          {
+            id: 3,
+            value: "项目三",
+            label: "项目三",
+          },
+          {
+            id: 4,
+            value: "项目四",
+            label: "项目四",
+          },
+        ],
+        projectNameList2: [
+          {
+            id: 1,
+            value: "删除任务",
+            label: "删除任务",
+          },
+          {
+            id: 2,
+            value: "移动任务到关卡",
+            label: "移动任务到关卡",
+          },
+        ],
+        //阶段数据
+        level: [],
+  
+        projectTitle: null,
+        picUrl: null,
+        //任务数据
+        tableData: [],
+        drawertableData: [
+          {
+            key: 1,
+            projectName: "管理者进阶",
+            manager: "黄华  刘俊",
+            creater: "毛继禹",
+            time: "2022-07-20 14:00:03",
+            children: [
+              {
+                key: "1-1",
+                projectName: "管理者进阶-腾飞班",
+                manager: "黄华  刘俊",
+                creater: "毛继禹",
+                time: "2022-07-20 14:00:03",
+                children: [
+                  {
+                    key: "1-1-1",
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            key: 2,
+            projectName: "管理者进阶",
+            manager: "黄华  刘俊",
+            creater: "毛继禹",
+            time: "2022-07-20 14:00:03",
+            children: [
+              {
+                key: "2-1",
+                projectName: "管理者进阶-腾飞班",
+                manager: "黄华  刘俊",
+                creater: "毛继禹",
+                time: "2022-07-20 14:00:03",
+                children: [
+                  {
+                    key: "2-1-1",
+                    projectName: "管理者进阶-腾飞班K1",
+                    manager: "黄华  刘俊",
+                    creater: "毛继禹",
+                    time: "2022-07-20 14:00:03",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            key: 3,
+            projectName: "管理者进阶-腾飞班K1",
+            manager: "黄华  刘俊",
+            creater: "毛继禹",
+            time: "2022-07-20 14:00:03",
+          },
+          {
+            key: 4,
+            projectName: "管理者进阶-腾飞班K1",
+            manager: "黄华  刘俊",
+            creater: "毛继禹",
+            time: "2022-07-20 14:00:03",
+          },
+          {
+            key: 5,
+            projectName: "管理者进阶-腾飞班K1",
+            manager: "黄华  刘俊",
+            creater: "毛继禹",
+            time: "2022-07-20 14:00:03",
+          },
+          {
+            key: "1-1-1",
+            projectName: "管理者进阶-腾飞班K1",
+            manager: "黄华  刘俊",
+            creater: "毛继禹",
+            time: "2022-07-20 14:00:03",
+          },
+        ],
+        currentPage: 1,
+        tableDataTotal: 100,
+        pageSize: 10,
+        addonlinevisible: false,
+        addfaceteachvisible: false,
+        addcasevisible: false,
+        editonlinevisible: false,
+        addhomeworkvisible: false,
+        addtestvisible: false,
+        addlivevisible: false,
+        addrefvisible: false,
+        adddiscussvisible: false,
+        addactivevisible: false,
+        addevalvisible: false,
+        addinvistvisible: false,
+        addvotevisible: false,
+        stage: false,
+        selectedRowKeys: [],
+        valuesname: "",
+        valuesnotice: "",
+        visiblene: false, //移动任务弹窗
+        confirmModal: false, //确认添加阶段弹窗
+        cC: false,
+        cancelModal: false, //确认取消阶段弹窗
+        deleteModal: false, //确认删除弹窗
+        isActive: false,
+        deleteLiveID: null, //删除直播id
+        deleteExternalID: null, //删除外链id
+        deleteEvalID: null, //测评
+        deleteInvistID: 4, //评估
+        deleteDiscussID: null, //删除讨论id
+        deleteActivityID: null, //删除活动id
+        voteId: "", //删除投票id
+        deleteID: "",
+        selectRow: [], //选择行
+        curLevel: [], //阶段名称
+        selectAll: 0, //0：未选择，1：全选，2：部分选择
+  
+        updateStageID: null, //编辑阶段id
+        deleteStageId: null, //删除阶段的id
+        deleteStageModal: false, //删除阶段弹窗
+  
+        unlockModeVisible: false, //切换模式抽屉
+      });
+      console.log("projectId", state.projectId);
+      const selectProjectName = (value, index) => {
+        console.log("value", value, index);
+      };
+      const selectProjectName2 = (value, index) => {
+        console.log("value", value, index);
+      };
+      const afterVisibleChange = (bool) => {
+        console.log("visible", bool);
+      };
+  
+      // 把数据放到state里
+      const getTableData = (tableData) => {
+        let data = tableData;
+        let array = [];
+        console.log("data", data);
+        data.map((value) => {
+          let obj = {
+            id: value.projectTaskId,
+            key: value.projectTaskId,
+            lei:
+              value.type == 1
+                ? "在线"
+                : value.type == 2
+                ? "面授"
+                : value.type == 3
+                ? "案例"
+                : value.type == 4
+                ? "作业"
+                : value.type == 5
+                ? "考试"
+                : value.type == 6
+                ? "直播"
+                : value.type == 7
+                ? "外链"
+                : value.type == 8
+                ? "讨论"
+                : value.type == 9
+                ? "活动"
+                : value.type == 10
+                ? "测评"
+                : value.type == 11
+                ? "评估"
+                : value.type == 12
+                ? "投票"
+                : "-",
+            creater: value.name,
+            cretime: value.duration ? value.duration : "-",
+            checked1: value.flag ? true : false,
+            checked: false, //是否选中类型
+            courseId: value.courseId,
+            projectId: value.projectId,
+            stageId: value.stageId,
+            type: value.type,
+          };
+          array.push(obj);
+        });
+        state.tableData = array;
+        console.log("state.tableData", state.tableData);
+      };
+      //把阶段放到level里
+      const getStageData = (tableData) => {
+        let data = tableData;
+        let array = [];
+        data.map((value) => {
+          let obj = {
+            id: value.stageId,
+            tit: value.name,
+            name: value.remark,
+            taskList: value.taskList,
+            value: value.stageId,
+            label: value.name,
+          };
+          array.push(obj);
+        });
+        state.level = array;
+      };
+  
+      const tableDataFunc = () => {
+        const columns = [
+          {
+            title: "类型",
+            dataIndex: "state",
+            // width: "30%",
+            key: "state",
+            width: 60,
+            align: "left",
+            className: "classify",
+            scopedSlots: { customRender: "action" },
+            customRender: (text) => {
+              // console.log(text.record.checked1);
+              return (
+                <div class="racona">
+                  <div
+                    class="img"
+                    style={{ cursor: "pointer" }}
+                    onClick={() => {
+                      console.log("点击了");
+                    }}
+                  ></div>
+                  <span> {text.record.lei}</span>
+  
+                  {/**
+                                              <div class="img"></div>
+                              <a-checkbox class="ch" checked={text.record.checkedd}>
+                                {text.record.lei}
+                              </a-checkbox>
+              */}
+                </div>
+              );
+            },
+          },
+          {
+            title: "任务名称",
+            dataIndex: "creater",
+            // width: "30%",
+            key: "creater",
+            width: 200,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "必修/选修",
+            dataIndex: "pubtime",
+            key: "pubtime",
+            // width: 100,
+            align: "center",
+            className: "h",
+            scopedSlots: { customRender: "action" },
+            customRender: (text) => {
+              // console.log(text.record.checked1);
+              return (
+                <div class="opat">
+                  <div class="opacationt clearfix">
+                    <a-switch
+                      style="margin-left:-50px;margin-top:3px"
+                      checked={text.record.checked1}
+                      size="small"
+                      active-color="red"
+                      onClick={() => {
+                        console.log("点击了");
+                        text.record.checked1 = !text.record.checked1;
+                      }}
+                    />
+                    <div class="showt clearfix">
+                      <div
+                        class="bi"
+                        style={
+                          text.record.checked1 ? "z-index:999" : "z-index:998"
+                        }
+                      >
+                        必修
+                      </div>
+                      <div class="xuan">选修</div>
+                    </div>
+                  </div>
+                </div>
+              );
+            },
+          },
+          {
+            title: "时长",
+            dataIndex: "cretime",
+            key: "cretime",
+            // width: 100,
+            align: "center",
+            className: "h",
+          },
+          {
+            title: "操作",
+            className: "h",
+            dataIndex: "opacation",
+            key: "opacation",
+            // width: 100,
+            align: "center",
+            scopedSlots: { customRender: "action" },
+            customRender: (text) => {
+              return (
+                <div class="opa">
+                  <div class="opacation">
+                    <span
+                      onClick={() => {
+                        state.editonlinevisible = true;
+                        console.log(text, "编辑text");
+                      }}
+                      style="color:#4EA6FF;margin-right:25px;cursor:pointer"
+                    >
+                      编辑
+                    </span>
+                    <span
+                      style="color:#4EA6FF;cursor:pointer"
+                      onClick={() => {
+                        showDelete();
+                        state.deleteID = text.record.id;
+                      }}
+                    >
+                      删除
+                    </span>
+                  </div>
+                </div>
+              );
+            },
+          },
+        ];
+        return columns;
+      };
+  
+      //获取任务列表
+      const getTask = () => {
+        // console.log("state.projectId", state.projectId);
+        let obj = {
+          projectId: state.projectId,
+          // projectId: 28,
+        };
+        api
+          .getTask(obj)
+          .then((res) => {
+            if (res.status == 200) {
+              console.log("22222", res.data.data.stageList);
+              // console.log("22222", res.data.data.stageList);
+              state.projectTitle = res.data.data.projectInfo.name;
+              state.picUrl = res.data.data.projectInfo.picUrl;
+              let leng = res.data.data.stageList.length;
+              if (leng > 0) {
+                let stage = localStorage.getItem("stageId")
+                  ? localStorage.getItem("stageId")
+                  : null;
+                console.log("zhaodaole", stage);
+                // console.log("stage",Object.prototype.toString.call(stage))
+                getStageData(res.data.data.stageList);
+                if (stage !== "null") {
+                  console.log(stage);
+                  let stageList = res.data.data.stageList; //阶段数组
+                  let result = stageList.find((item) => item.stageId == stage);
+                  console.log("又找到了", result);
+                  getTableData(result.taskList);
+                } else {
+                  let arr = res.data.data.stageList[0].taskList;
+                  console.log("任务列表", arr);
+                  getTableData(arr);
+                  // state.isActive = true;
+                  changebgc(res.data.data.stageList[0].stageId);
+                }
+  
+                // 每次都获取了第一条taskList
+                // let arr = res.data.data.stageList[0].taskList;
+                // console.log("任务列表", stage, arr);
+                // getTableData(arr);
+              }
+  
+              let stagearr = res.data.data.stageList;
+              let arrlist = state.curLevel;
+              console.log(stagearr, 111111);
+              if (stagearr.length > 0) {
+                getStageData(stagearr);
+                stagearr.map((value) => {
+                  console.log(value);
+                  arrlist.push();
+                });
+              }
+              //给阶段id赋初始值
+              let stageid = localStorage.getItem("stageId")
+                ? localStorage.getItem("stageId")
+                : null;
+              if (stageid !== "null") {
+                state.chooseStageId = stageid;
+              } else {
+                state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
+              }
+            }
+          })
+          .catch((err) => {
+            console.log("获取任务列表失败", err);
+          });
+      };
+  
+      //获取修改、删除id（投票)
+      const changeVData = (data) => {
+        console.log("获取修改、删除id投票", data);
+        state.voteId = data.voteId;
+        state.ballotId = data.ballotId;
+      };
+      //数据变化
+      const updateTableData = (data) => {
+        console.log("添加数据", data);
+        getTask(data);
+      };
+  
+      //删除任务
+      const deleteTask = () => {
+        let obj = { projectTaskIds: state.deleteID };
+        api
+          .deleteTask(obj)
+          .then((res) => {
+            console.log(res, "gggggggggggggggg");
+            // deleteVoteText();
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      };
+  
+      const showChangeModal = () => {
+        if (state.selectRow.length == 0) {
+          message.destroy();
+          return message.warning("请选择要移动的任务");
+        } else {
+          state.visiblene = true;
+        }
+      };
+      const closeChangeModal = () => {
+        state.visiblene = false;
+      };
+      //移动任务到阶段
+      const moveTask = () => {
+        if (state.chooseStageId == state.removeStageId) {
+          console.log("buneng");
+          message.destroy();
+          message.warning("选择的任务已在当前阶段");
+        } else if (state.removeStageId == null) {
+          message.destroy();
+          message.warning("请选择阶段");
+        } else {
+          {
+            let obj = {
+              stageId: state.removeStageId,
+              projectTaskId: state.selectRow,
+            };
+            apimove
+              .moveTask(obj)
+              .then((res) => {
+                console.log("移动成功", res);
+                message.destroy();
+                message.success("移动成功");
+                console.log(state.removeStageId);
+                getTask();
+                localStorage.setItem("stageId", state.chooseStageId);
+              })
+              .catch((err) => {
+                console.log("移动失败", err);
+              });
+            state.visiblene = false;
+          }
+        }
+      };
+      //批量删除
+      const deleteTaskAll = () => {
+        let arr = state.selectRow;
+        console.log("选择的行信息", arr);
+        arr.map((value) => {
+          let obj = {
+            projectTaskIds: value,
+          };
+          api
+            .deleteTask(obj)
+            .then((res) => {
+              console.log(res);
+              message.destroy();
+              message.success("批量删除成功");
+              getTask();
+            })
+            .catch((err) => {
+              console.log(err);
+              message.destroy();
+              message.warning("批量删除失败");
+            });
+        });
+        state.deAll = false;
+      };
+      const onSelectChange = (selectedRowKeys) => {
+        console.log("selectedRowKeys changed: ", selectedRowKeys);
+        state.selectedRowKeys = selectedRowKeys;
+      };
+      // const getClientHeight = () => {
+      //   state.rightheight =
+      //     document.getElementsByClassName("addhead")[0].offsetHeight +
+      //     document.getElementsByClassName("mid")[0].offsetHeight +
+      //     document.getElementsByClassName("boom")[0].offsetHeight +
+      //     40 +
+      //     "px";
+      // };
+  
+      const showModal1 = () => {
+        //关闭确认框
+        state.deleteModal = false;
+        deleteTask();
+        message.success("删除成功");
+        getTask();
+      };
+      //关闭添加阶段弹窗
+      const closeModal = () => {
+        state.stage = false;
+        state.valuesname = "";
+        state.valuesnotice = "";
+        state.updateStageID = null;
+      };
+      //显示添加阶段弹窗
+      const showModal = (element) => {
+        state.stage = true;
+        //关闭确认框
+        closeConfirm();
+  
+        if (element) {
+          state.valuesname = element.tit;
+          state.valuesnotice = element.name;
+          state.updateStageID = element.id;
+        }
+      };
+      //添加阶段
+      const editStage = () => {
+        if (!state.valuesname) {
+          message.destroy();
+          return message.warning("请输入阶段名称");
+        }
+        if (state.updateStageID) {
+          let obj = {
+            name: state.valuesname,
+            projectId: state.projectId,
+            remark: state.valuesnotice,
+            stageId: state.updateStageID,
+          };
+          apistage
+            .editStage(obj)
+            .then((res) => {
+              console.log("修改阶段成功", res);
+              state.valuesname = "";
+              state.valuesnotice = "";
+              closeModal();
+              state.updateStageID = null;
+              message.destroy();
+              message.success("修改阶段成功");
+              getTask();
+            })
+            .catch((err) => {
+              console.log("添加阶段失败", err);
+            });
+        } else {
+          let obj = {
+            name: state.valuesname,
+            projectId: state.projectId,
+            remark: state.valuesnotice,
+          };
+          apistage
+            .editStage(obj)
+            .then((res) => {
+              console.log("添加阶段成功", res);
+              state.valuesname = "";
+              state.valuesnotice = "";
+              closeModal();
+              message.destroy();
+              message.success("添加阶段成功");
+              getTask();
+            })
+            .catch((err) => {
+              console.log("添加阶段失败", err);
+            });
+        }
+      };
+  
+      //打开删除阶段弹窗
+      const showDeleteStage = (id) => {
+        state.deleteStageId = id;
+        state.deleteStageModal = true;
+      };
+      //关闭删除阶段弹窗
+      const closeDeleteStage = () => {
+        state.deleteStageId = null;
+        state.deleteStageModal = false;
+      };
+      //删除阶段
+      const deleteStage = () => {
+        console.log("chapterId", state.deleteStageId);
+        let obj = {
+          stageId: state.deleteStageId,
+        };
+        apistage
+          .deleteStage(obj)
+          .then((res) => {
+            console.log("删除阶段成功", res);
+            message.success("删除阶段成功");
+            closeDeleteStage();
+            getTask();
+          })
+          .catch((err) => {
+            console.log("删除阶段失败", err);
+          });
+      };
+      onMounted(() => {
+        document.getElementsByTagName("main")[0].style.background =
+          "rgb(245, 247, 250,1)";
+        document.getElementsByTagName("main")[0].style.boxShadow = "none";
+        getTask();
+      });
+      onUpdated(() => {
+        // getTask();
+        // setTimeout(() => {
+        //   getTask();
+        // }, 500);
+      });
+      onUnmounted(() => {
+        document.getElementsByTagName("main")[0].style.background = "#ffffff";
+        document.getElementsByTagName("main")[0].style.boxShadow =
+          "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
+      });
+      const showDrawerOnline = (id, eleId) => {
+        state.addonlinevisible = true;
+        state.EditOnlineId = id;
+        state.projectTaskId = eleId;
+      };
+      const showDrawerFaceteach = () => {
+        state.addfaceteachvisible = true;
+      };
+      const showDrawerAddCase = (id, eleId) => {
+        state.addcasevisible = true;
+        state.EditCaseId = id;
+        state.projectTaskId = eleId;
+      };
+      const showDrawerAddHomework = (id, eleId) => {
+        state.EditWorkId = id;
+        state.projectTaskId = eleId;
+        state.addhomeworkvisible = true;
+      };
+      const showDrawerAddTest = (id, eleId) => {
+        state.EditTestId = id;
+        state.projectTaskId = eleId;
+        state.addtestvisible = true;
+      };
+      const showDrawerAddLive = (id, eleId) => {
+        state.addlivevisible = true;
+        state.EditLiveId = id;
+        state.projectTaskId = eleId;
+      };
+      const showDrawerAddRef = (id, eleId) => {
+        state.EditRefId = id;
+        state.projectTaskId = eleId;
+        state.addrefvisible = true;
+      };
+      const showDrawerAddDiscuss = (id, eleId) => {
+        state.EditDiscussId = id;
+        state.projectTaskId = eleId;
+        state.adddiscussvisible = true;
+      };
+  
+      const showDrawerAddActive = (id, eleId) => {
+        state.addactivevisible = true;
+        state.EditActiveId = id;
+        state.projectTaskId = eleId;
+        console.log("active=======", id);
+      };
+      const showDrawerAddEval = (id, eleId) => {
+        state.addevalvisible = true;
+        // state.EditEvalId = id;
+        state.evaluationId = id;
+        state.projectTaskId = eleId;
+      };
+      const showDrawerAddInvist = (id, eleId) => {
+        console.log(id, eleId, "213312");
+        state.addinvistvisible = true;
+        state.projectTaskId = eleId;
+      };
+      const showDrawerAddVote = (id, eleId) => {
+        console.log(id, eleId, "95835325932953295325");
+        state.addvotevisible = true;
+        state.EditVoteId = id;
+        state.projectTaskId = eleId;
+        // voteId = state.voteId;
+        // ballotId = state.ballotId;
+      };
+      const showConfirm = () => {
+        state.confirmModal = true;
+      };
+      const closeConfirm = () => {
+        state.confirmModal = false;
+      };
+      const showCancel = () => {
+        state.cancelModal = true;
+      };
+      const closeCancel = () => {
+        state.cancelModal = false;
+      };
+      const showDelete = (id) => {
+        state.deleteModal = true;
+        state.deleteID = id;
+      };
+      const closeDelete = () => {
+        state.deleteModal = false;
+      };
+      const changebgc = (id) => {
+        state.isActive = !state.isActive;
+        state.selectRow = []; //选择行
+        state.selectAll = 0; //0：未选择，1：全选，2：部分选择
+        console.log("state.level", id, state.level);
+        state.chooseStageId = id;
+        let final = state.level.find((item) => item.id === id);
+        getTableData(final.taskList);
+      };
+  
+      //选择单个任务
+      const changeRow = (e) => {
+        //selectRow:已经选择的任务的id数组
+        let arr = state.selectRow;
+        if (e.target.checked) {
+          arr.push(e.target.id);
+        } else {
+          arr.map((value, index) => {
+            if (value == e.target.id) {
+              arr.splice(index, 1);
+            }
+          });
+        }
+        state.selectRow = arr;
+        console.log(state.selectRow, "xuanzhong");
+        console.log(Object.prototype.toString.call(state.selectRow));
+        //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
+        if (arr.length !== 0) {
+          if (arr.length === state.tableData.length) {
+            state.selectAll = 1;
+          } else {
+            state.selectAll = 2;
+          }
+        } else {
+          state.selectAll = 0;
+        }
+        console.log("state.selectRow", state.selectRow, state.selectAll);
+      };
+      //全选任务或全不选任务
+      const selectRowAll = () => {
+        let arr = state.tableData;
+        let array = [];
+        if (state.selectAll === 0 || state.selectAll === 2) {
+          arr.map((value) => {
+            // console.log("value", value, index);
+            value.checked = true;
+            array.push(value.id);
+            // if (value == e.target.id) {
+            //   arr.splice(index, 1);
+            // }
+            state.selectAll = 1;
+          });
+        } else {
+          array = [];
+          arr.map((value) => {
+            // console.log("value", value, index);
+            value.checked = false;
+            state.selectAll = 0;
+          });
+        }
+        state.tableData = arr;
+        state.selectRow = array;
+      };
+      //修改任务的课程类型 id为任务id
+      const changeCourseType = (ele) => {
+        console.log("任务id", ele.id);
+        console.log("flag", ele.checked1);
+        let obj = {
+          courseId: ele.courseId,
+          duration: ele.cretime == "-" ? 0 : ele.cretime,
+          flag: ele.checked1,
+          name: ele.creater,
+          projectId: ele.projectId,
+          projectTaskId: ele.id,
+          stageId: ele.stageId,
+          type: ele.type,
+        };
+        api
+          .addTask(obj)
+          .then((res) => {
+            console.log(`修改状态成功${res.data}`);
+            message.destroy();
+            message.success("修改成功");
+          })
+          .catch((err) => {
+            console.log(`修改状态失败${err.data}`);
+            message.destroy();
+            message.warning("修改失败");
+          });
+      };
+  
+      //打开测评的弹窗
+      const showEditEvalDrawer = (id, eleId) => {
+        console.log("222222222222222222222", id);
+        state.addevalvisible = true;
+        state.projectTaskId = eleId;
+        state.EditRefId = id;
+        console.log(state.EditRefId);
+      };
+      //编辑的按钮
+      const decideType = (type, id, eleId) => {
+        state.edit = true;
+        console.log(type, id);
+        if (type == "外链") {
+          showDrawerAddRef(id, eleId);
+        } else if (type == "直播") {
+          showDrawerAddLive(id, eleId);
+        } else if (type == "测评") {
+          showEditEvalDrawer(id, eleId);
+        } else if (type == "评估") {
+          showDrawerAddInvist(id, eleId);
+        } else if (type == "投票") {
+          showDrawerAddVote(id, eleId);
+        } else if (type == "讨论") {
+          showDrawerAddDiscuss(id, eleId);
+        } else if (type == "活动") {
+          showDrawerAddActive(id, eleId);
+        } else if (type == "作业") {
+          showDrawerAddHomework(id, eleId);
+        } else if (type == "考试") {
+          showDrawerAddTest(id, eleId);
+        } else if (type == "在线") {
+          showDrawerOnline(id, eleId);
+        }
+      };
+      const showdeAll = () => {
+        if (state.selectRow.length == 0) {
+          message.destroy();
+          return message.warning("请选择要删除的任务");
+        } else {
+          state.deAll = true;
+        }
+      };
+      const closeDeAll = () => {
+        state.deAll = false;
+      };
+      const handleChangeStage = (value, option) => {
+        console.log("阶段改变", value, option);
+        state.removeStageId = option.id;
+      };
+  
+      //显示切换模式抽屉
+      const showModeVisible = () => {
+        state.unlockModeVisible = true;
+      };
+      return {
+        ...toRefs(state),
+        selectProjectName,
+        selectProjectName2,
+        tableDataFunc,
+        showModal,
+        closeModal,
+        // showDrawer,
+        afterVisibleChange,
+        drawercolumns,
+        onSelectChange,
+        showDrawerOnline,
+        showDrawerFaceteach,
+        showDrawerAddCase,
+        showDrawerAddHomework,
+        showDrawerAddTest,
+        showDrawerAddLive,
+        showDrawerAddRef,
+        showDrawerAddDiscuss,
+        showDrawerAddActive,
+        showDrawerAddEval,
+        showEditEvalDrawer,
+        showDrawerAddInvist,
+        showDrawerAddVote,
+        showConfirm,
+        closeConfirm,
+        showCancel,
+        showModal1,
+        closeCancel,
+        showDelete,
+        closeDelete,
+        showChangeModal,
+        closeChangeModal,
+        changebgc,
+        getTask,
+        getTableData,
+        deleteTask,
+        editStage,
+        updateTableData,
+        changeVData,
+        changeRow,
+        selectRowAll,
+        changeCourseType,
+        getStageData,
+        moveTask,
+        deleteTaskAll,
+        decideType,
+        showdeAll,
+        closeDeAll,
+        handleChangeStage,
+  
+        showDeleteStage,
+        closeDeleteStage,
+        deleteStage,
+  
+        showModeVisible,
+      };
+    },
+  };
+  </script>
+  
+  <style lang="scss">
+  // .ant-input {
+  //   border-radius: 8px;
+  //   // height: 120%;
+  //   width: 384px;
+  //   height: 88px;
+  // }
+  .ConfirmModal {
+    .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: 40px;
+              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/coursewareManage/QR.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;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  .addstage {
+    .ant-modal {
+      .ant-modal-body {
+        padding: 0 !important;
+        .modalHeader {
+          background: linear-gradient(
+            0deg,
+            rgba(78, 166, 255, 0) 0%,
+            rgba(78, 166, 255, 0.2) 100%
+          );
+        }
+        .modalMain {
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 5px;
+          }
+        }
+      }
+    }
+  
+    .name {
+      width: 78%;
+      // 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;
+        }
+      }
+      .d {
+        margin-top: 8px;
+        font-size: 25px;
+        color: #ff4e4e;
+      }
+      .box {
+        position: relative;
+        margin-left: 14px;
+        .box1 {
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          width: 50px;
+          margin-left: -25px;
+          margin-top: -5px;
+          border-top: 2px solid rgba(78, 166, 255, 1);
+        }
+        .box2 {
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          height: 50px;
+          //margin-left: -5px;
+          margin-top: -25px;
+          border-left: 2px solid rgba(78, 166, 255, 1);
+        }
+      }
+      .inname {
+        color: #000000;
+        font-size: 14px;
+        margin-left: 7px;
+      }
+      .in {
+        margin-left: 14px;
+        flex: 1;
+        // .ant-radio-wrapper {
+        // }
+        .ant-input-affix-wrapper {
+          width: 384px;
+          border-radius: 8px;
+        }
+        .ant-input {
+          border-radius: 8px;
+          // height: 120%;
+          //width: 384px;
+          height: 30px;
+        }
+      }
+    }
+  }
+  .moveModal {
+    .ant-modal {
+      width: 549px !important;
+      height: 245px !important;
+      .ant-modal-content {
+        width: 549px !important;
+        height: 245px !important;
+        .ant-modal-body {
+          padding: 0 !important;
+          width: 549px !important;
+          height: 245px !important;
+          .con {
+            // background-color: #bfa;
+            width: 100%;
+            height: 100%;
+  
+            .header {
+              width: 100%;
+              display: flex;
+              height: 68px;
+              position: relative;
+              justify-content: center;
+  
+              background: linear-gradient(
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
+              );
+              .inhe {
+                width: 80%;
+                height: 100%;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                .mod {
+                  left: 30px;
+                  top: 27px;
+                  position: absolute;
+                  width: 18px;
+                  height: 17px;
+                  background-image: url(../../assets/images/leveladd/mod.png);
+                }
+                .tz {
+                  color: #000000;
+                  font-weight: 400;
+                  font-size: 16px;
+                }
+                .mg {
+                  width: 20px;
+                  height: 20px;
+                  background-image: url(../../assets/images/basicinfo/close22.png);
+                  background-size: 100% 100%;
+                  cursor: pointer;
+                }
+              }
+            }
+            .mid {
+              width: 100%;
+              display: flex;
+              height: 100%;
+              justify-content: center;
+              .inher {
+                width: 80%;
+                height: 100%;
+                .cur {
+                  color: #6f6f6f;
+                  font-size: 14px;
+                }
+                .select {
+                  margin-top: 10px;
+                }
+                .btn {
+                  width: 100%;
+                  display: flex;
+                  justify-content: center;
+                  margin-top: 30px;
+                  .sameb {
+                    width: 100px;
+                    height: 40px;
+                    font-size: 14px;
+  
+                    border-radius: 8px;
+                  }
+                  .btn1 {
+                    color: #4ea6ff;
+                    background: #ffffff;
+                    border: 1px solid #4ea6ff;
+                  }
+                  .btn2 {
+                    margin-left: 16px;
+                    border: 0;
+                    color: #ffffff;
+                    background: #4ea6ff;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  // .info {
+  //   width: 78%;
+  //   // background-color: lightcoral;
+  //   display: flex;
+  //   margin-top: 30px;
+  //   // align-items: center;
+  //   // height: 40px;
+  //   // border: 1px solid black;
+  
+  //   .inname {
+  //     color: #6f6f6f;
+  //     font-size: 14px;
+  //     margin-left: 26px;
+  //     margin-top: 15px;
+  //   }
+  //   .in {
+  //     margin-left: 14px;
+  //     width: 81%;
+  //     position: relative;
+  //     .ant-input {
+  //       border-radius: 5px;
+  //       // height: 120%;
+  //       width: 100%;
+  //       height: 130px;
+  //       resize: none;
+  //     }
+  //   }
+  // }
+  
+  // .drawerStyle {
+  //   .ant-drawer-content-wrapper {
+  //     // max-width: 1000px;
+  //     .ant-drawer-header {
+  //       display: none !important;
+  //     }
+  //     .ant-drawer-body {
+  //       padding: 0;
+  //     }
+  //   }
+  //   .drawerMain {
+  //     min-width: 600px;
+  //     margin: 0px 32px 0px 32px;
+  //     overflow-x: auto;
+  //     display: flex;
+  //     flex-direction: column;
+  //     .header {
+  //       height: 73px;
+  //       border-bottom: 1px solid #e8e8e8;
+  //       display: flex;
+  //       justify-content: space-between;
+  //       align-items: center;
+  //       // background-color: red;
+  //       margin-bottom: 20px;
+  //       .headerTitle {
+  //         font-size: 18px;
+  //         font-weight: 600;
+  //         color: #333333;
+  //         line-height: 25px;
+  //         // margin-left: 24px;
+  //       }
+  //     }
+  //     .drawerbox {
+  //       margin: 20px 38px 30px;
+  //       th {
+  //         background-color: #eff4fc !important;
+  //       }
+  
+  //       .ant-table-tbody
+  //         > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+  //         > td {
+  //         background: #f6f9fd;
+  //       }
+  //     }
+  //     .btnn {
+  //       height: 72px;
+  //       width: 100%;
+  //       position: absolute;
+  //       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;
+  //       }
+  //     }
+  //   }
+  // }
+  .taskadd {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    min-width: 933px;
+    // min-width: 1200px;
+    // overflow-x: hidden;
+    // min-width: 1400px;
+    // overflow: scroll;
+    background-color: rgba(245, 247, 250, 1);
+    .left {
+      margin-right: 20px;
+      width: 208px;
+      // height: 100%;
+      // flex: 1;
+      // height: 100%;
+      background: #ffffff;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+      display: flex;
+      justify-content: center;
+      .leftmain {
+        // width: 86%;
+        margin-top: 20px;
+        .tit {
+          margin-left: 20px;
+          font-size: 18px;
+          color: #363636;
+        }
+  
+        // flex-wrap: wrap;
+        .btn {
+          margin-top: 20px;
+          // padding: 0px 26px 0px 26px;
+          height: 38px;
+          background: #fff6e8;
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          // margin-right: 14px;
+          flex-shrink: 0;
+          cursor: pointer;
+          .search {
+            background-size: 100%;
+          }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            color: #ffb64e;
+            // line-height: 38px;
+            margin-top: 4px;
+            margin-left: 5px;
+          }
+        }
+  
+        .btn3 {
+          width: 171px;
+          margin-right: 0px;
+          .search {
+            width: 17px;
+            height: 18px;
+            background-image: url("../../assets/images/leveladd/add.png");
+            background-size: 100% 100%;
+          }
+        }
+        .maincon {
+          margin-top: 17px;
+          width: 208px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+  
+          .ghost {
+            // background-color: red;
+            opacity: 0 !important;
+          }
+          .items {
+            width: 171px;
+            // height: 83px;
+            background: rgba(255, 182, 78, 0.1);
+            border: 1px solid #ffb64e;
+            opacity: 0.45;
+            border-radius: 8px;
+            margin-bottom: 16px;
+            align-items: center;
+            padding: 16px;
+            opacity: 0.5;
+            cursor: pointer;
+            .items1 {
+              margin-bottom: 12px;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              .boxs_left {
+                display: flex;
+                align-items: center;
+                .script {
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                  width: 56px;
+                  height: 24px;
+                  background: #ffb64e;
+                  border-radius: 6px;
+                  margin-right: 12px;
+                  white-space: nowrap;
+                }
+                .imgIcon {
+                  width: 16px;
+                  height: 16px;
+                  background-image: url(@/assets/images/leveladd/edit1.png);
+                  background-size: 100% 100%;
+                }
+              }
+              .boxs_right {
+                .imgIcon {
+                  width: 16px;
+                  height: 16px;
+                  background-image: url(@/assets/images/leveladd/delete.png);
+                  background-size: 100% 100%;
+                }
+              }
+            }
+            .items2 {
+              .nname {
+                width: 140px;
+                // overflow: hidden;
+                // text-overflow: ellipsis;
+                // white-space: nowrap;
+                font-weight: bold;
+  
+                overflow: hidden;
+                text-overflow: ellipsis;
+                -webkit-line-clamp: 2;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+              }
+            }
+          }
+          .active {
+            opacity: 1;
+            // transition: all 0.5s;
+          }
+        }
+      }
+    }
+    .right {
+      flex: 1;
+      // background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      .addhead {
+        width: 100%;
+        // min-width: 500px;
+        // height: 130px;
+        // flex: 1;
+        background-color: #fff;
+        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+        display: flex;
+        align-items: center;
+        position: relative;
+        .filt {
+          margin: 16px 30px 16px 22px;
+          display: flex;
+          justify-content: space-between;
+          width: 100%;
+          align-items: center;
+          flex-wrap: wrap;
+          .le {
+            display: flex;
+            align-items: center;
+            // margin-bottom: 10px;
+            .leftimg {
+              width: 151px;
+              height: 100px;
+              border: 10px solid #e7f2ff;
+              border-radius: 8px;
+              margin-left: 20px;
+              .img {
+                width: 100%;
+                height: 100%;
+              }
+            }
+            .imgfor {
+              margin-left: 32px;
+              .forz {
+                color: #363636;
+                font-size: 16px;
+              }
+              .fort {
+                color: #878b92;
+                font-size: 14px;
+                margin-top: 20px;
+              }
+            }
+          }
+  
+          .rightt {
+            // width: 500px;
+            height: 100%;
+            // background-color: red;
+            // position: absolute;
+            // right: 0;
+            display: flex;
+            align-items: center;
+            .select {
+              display: flex;
+              align-items: center;
+              white-space: nowrap;
+              margin-right: 56px;
+              .inputbox {
+                display: flex;
+                align-items: center;
+                border: 1px solid #c7cbd2;
+                width: 238px;
+                height: 40px;
+                border-radius: 8px;
+                input {
+                  border: none;
+                  outline: none;
+                }
+                .bottonbox {
+                  width: 100px;
+                  height: 40px;
+                  background: #409eff;
+                  border-radius: 8px;
+                  display: flex;
+                  justify-content: center;
+                  align-items: center;
+                  cursor: pointer;
+                  flex-shrink: 0;
+                  .btnText {
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #ffffff;
+                    line-height: 36px;
+                    margin-left: 5px;
+                  }
+                }
+              }
+            }
+            .line {
+              height: 60px;
+              width: 1px;
+              background-color: #e8effa;
+              margin-right: 18px;
+            }
+            .img2 {
+              width: 42px;
+              height: 42px;
+              margin-right: 18px;
+            }
+            .pub {
+              color: #57c887;
+              font-size: 14px;
+              margin-top: 5px;
+              margin-right: 30px;
+              cursor: pointer;
+              white-space: nowrap;
+            }
+            @media screen and (max-width: 1050px) {
+              .pub {
+                margin-right: 10px;
+              }
+              .line {
+                margin-right: 10px;
+              }
+            }
+            .return {
+              color: #4ea6ff;
+              font-size: 14px;
+              margin-top: 13px;
+              margin-right: 20px;
+              white-space: nowrap;
+            }
+  
+            .role {
+              display: flex;
+              align-items: center;
+              font-size: 16px;
+              font-weight: 400;
+              color: #333330;
+              line-height: 36px;
+              cursor: pointer;
+              position: relative;
+              margin-right: 20px;
+              .roleArrow {
+                width: 13px;
+                height: 7px;
+                margin-left: 8px;
+                background-image: url(../../assets/images/navtop/down.png);
+                background-size: 100%;
+              }
+              .roleItems {
+                width: 109px;
+                height: 90px;
+                padding-top: 10px;
+                background: #ffffff;
+                box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+                position: absolute;
+                top: 35px;
+                right: 0px;
+                text-align: center;
+                display: none;
+                z-index: 100;
+              }
+              .roleItem {
+                font-size: 14px;
+                font-weight: 400;
+                color: rgba(79, 81, 86, 1);
+                line-height: 36px;
+              }
+              .roleItem:hover {
+                color: #4ea6ff;
+              }
+            }
+            .role:hover .roleItems {
+              display: block;
+            }
+            .role:hover .roleArrow {
+              background-image: url(../../assets/images/navtop/up.png);
+            }
+          }
+        }
+      }
+  
+      .mid {
+        width: 100%;
+        // height: 130px;
+        margin-top: 20px;
+        margin-bottom: 20px;
+        background-color: #fff;
+        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+        .item {
+          height: 115px;
+          // width: 7.7%;
+          display: flex;
+          align-items: center;
+          .itcon {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            height: 100%;
+            width: 100%;
+            margin-left: 38px;
+            margin-right: 38px;
+            .img {
+              cursor: pointer;
+            }
+            .text {
+              font-size: 16px;
+              color: #363636;
+              margin-top: 5px;
+              white-space: nowrap;
+            }
+          }
+          .lin {
+            width: 1px;
+            height: 60%;
+            background-color: #e8effa;
+          }
+          .no {
+            display: none;
+          }
+        }
+      }
+      .boom {
+        width: 100%;
+        flex: 1;
+        background-color: #fff;
+        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+        display: flex;
+        justify-content: center;
+        .boomcen {
+          width: 95%;
+          // height: 100%;
+          // background-color: #bfa;
+          .onerow {
+            width: 100%;
+            display: flex;
+            height: 40px;
+            position: relative;
+            margin-top: 20px;
+            .taskmain {
+              font-size: 18px;
+              color: #000000;
+              margin-top: 10px;
+            }
+            .btn {
+              position: absolute;
+              top: 0;
+              right: 130px;
+              background-color: #409eff;
+              width: 130px;
+              height: 40px;
+              border-radius: 8px;
+              border: 1px solid #409eff;
+              color: #ffffff;
+              cursor: pointer;
+            }
+            .edit {
+              position: absolute;
+              right: 0;
+              top: 0;
+              color: #409eff;
+              width: 120px;
+              height: 40px;
+              border: 1px solid #409eff;
+              border-radius: 8px;
+              .editimg {
+                width: 15px;
+                height: 15px;
+                margin-top: -2px;
+                margin-left: 25px;
+                margin-right: 5px;
+              }
+              .editext {
+                line-height: 40px;
+              }
+            }
+            .edit:hover {
+              color: #ffffff;
+              background-color: #409eff;
+              cursor: pointer;
+              .editimg {
+                background-image: url("../../assets/images/projectadd/delete1.png");
+              }
+            }
+          }
+          .notable {
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            .notablebox {
+              width: 412px;
+              height: 212px;
+              background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
+              border-radius: 10px;
+              display: flex;
+              justify-content: center;
+              text-align: center;
+              margin-top: 77px;
+              margin-bottom: 109px;
+              cursor: pointer;
+              position: relative;
+              .smallleft {
+                position: absolute;
+                top: 18px;
+                left: 0px;
+                width: 8px;
+                height: 21px;
+                border-radius: 0px 4px 4px 0px;
+                background-color: #ffb64e;
+              }
+              .smallright {
+                position: absolute;
+                bottom: 18px;
+                right: 0px;
+                width: 8px;
+                height: 21px;
+                border-radius: 4px 0px 0px 4px;
+                background-color: #ffb64e;
+              }
+              .boxbody {
+                .boximg {
+                  width: 72px;
+                  height: 72px;
+                  margin: 32px auto 20px auto;
+                  background-image: url(@/assets/images/coursewareManage/nostate.png);
+                  background-size: 100% 100%;
+                }
+                .boxtitle {
+                  margin-bottom: 4px;
+                }
+              }
+            }
+          }
+          .rwbox {
+            position: relative;
+            .talk {
+              margin-top: 24px;
+              margin-bottom: 11px;
+              width: 100%;
+              height: 50px;
+              background: #f5faff;
+              border: 1px solid #4ea6ff;
+              // opacity: 0.22;
+              display: flex;
+              align-items: center;
+              .im {
+                width: 14px;
+                height: 15px;
+                margin-left: 27px;
+              }
+              .xu {
+                height: 100%;
+                line-height: 50px;
+                margin-left: 13px;
+                .yi {
+                  color: #4f5156;
+                  font-size: 14px;
+                }
+                .zon {
+                  color: #999ba3;
+                  font-size: 14px;
+                  margin-left: 34px;
+                }
+                .th {
+                  color: #4ea6ff;
+                }
+              }
+            }
+            .tableBox {
+              margin-bottom: 20px;
+              margin-top: 20px;
+              .chosen {
+                background-color: #f2f6fc;
+                opacity: 1;
+              }
+              .ghost {
+                // background-color: red;
+                opacity: 0;
+              }
+              .tableRow:hover {
+                background-color: #f2f6fc;
+              }
+              //  .tableRow: {
+              //     background-color: #f2f6fc;
+              //   }
+              .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;
+              }
+            }
+          }
+        }
+      }
+      // .drawerbox {
+      //   // margin: 20px 38px 30px;
+      //   th.h {
+      //     background-color: #eff4fc !important;
+      //   }
+  
+      //   .ant-table-tbody
+      //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      //     > td {
+      //     background: #f6f9fd;
+      //   }
+      // }
+    }
+  
+    .opat {
+      .opacationt {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .ant-switch-checked {
+          background-color: #5dc988;
+        }
+        .showt {
+          // margin-top: 10px;
+          display: flex;
+          margin-left: 10px;
+          height: 23px;
+          position: relative;
+          .bi {
+            // margin-top: 10px;
+            width: 63px;
+            height: 23;
+            background-color: #5dc988;
+            line-height: 23px;
+            position: absolute;
+            z-index: 998;
+            color: #ffffff;
+            border-radius: 4px;
+          }
+          .xuan {
+            width: 63px;
+            height: 23px;
+            background-color: #f2f6fc;
+            line-height: 23px;
+            // display: none;
+            position: absolute;
+            z-index: 998;
+            color: #5dc988;
+            border-radius: 4px;
+          }
+        }
+      }
+    }
+    .racona {
+      display: flex;
+      align-items: center;
+      height: 100%;
+      .img {
+        width: 17px;
+        height: 14px;
+        background-image: url("../../assets/images/leveladd/z1.png");
+        // position: absolute;
+        // left: -40px;
+      }
+      .ch {
+        margin-left: 10px;
+      }
+    }
+    .footbtn {
+      width: 100%;
+      height: 80px;
+      margin-top: 16px;
+      // flex: 1;
+      background-color: #fff;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
+      display: flex;
+      justify-content: end;
+      .btnbox {
+        display: flex;
+        margin-right: 36px;
+        height: 80px;
+        .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;
+          flex-shrink: 0;
+          margin: 21px 0px 19px 14px;
+          cursor: pointer;
+          white-space: nowrap;
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+        }
+        .btn1 {
+          background-color: #409eff;
+          .btnText {
+            color: #ffffff;
+          }
+        }
+        .btn2 {
+          background-color: #ffffff;
+          .btnText {
+            color: #409eff;
+          }
+        }
+      }
+    }
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 60bc59ee..05959e27 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -6,7 +6,7 @@
       <div
         @click="backPage"
         style="cursor: pointer"
-        to="/libraryAdd"
+        to="/manage/libraryAdd"
         class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -24,11 +24,10 @@
           </div>
           <div class="in">
             <a-input
-              v-model:value="projectName"
+              v-model:value="projectInfo.name"
               placeholder="请输入模板名称"
               show-count
               :maxlength="30"
-              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -47,14 +46,13 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect"
-              placeholder="四个养成"
+              v-model:value="projectInfo.category"
+              placeholder="管理者"
               style="width: 100%"
               :options="classifyList"
               @change="classificationChange"
               allowClear
               showSearch
-              :disabled="viewDetail ? true : false"
             >
             </a-select>
           </div>
@@ -88,7 +86,6 @@
               action="/api/file/upload"
               :before-upload="beforeUpload"
               @change="handleChange"
-              :disabled="viewDetail ? true : false"
             >
               <img
                 style="
@@ -126,8 +123,6 @@
               :placeholder="['      开始时间', '        结束时间']"
               v-model:value="rangevalue"
               style="width: 100%; height: 40px; border-radius: 5px"
-              @change="onRangeChange"
-              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -146,7 +141,7 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              :value="classifySelect1"
+              :value="projectInfo.manager"
               mode="multiple"
               placeholder="请选择项目经理"
               style="width: 100%"
@@ -154,7 +149,6 @@
               @change="classificationChange1"
               allowClear
               showSearch
-              :disabled="viewDetail ? true : false"
             >
             </a-select>
           </div>
@@ -175,11 +169,10 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect2"
-              placeholder="自动带出 可修改"
+              v-model:value="projectInfo.sourceBelongId"
+              placeholder="项目一"
               :options="classifyList2"
               @change="classificationChange2"
-              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -189,12 +182,11 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="remark"
+              v-model:value="projectInfo.remark"
               style="height: 80px"
               placeholder="请输入说明"
               show-count
               :maxlength="200"
-              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -205,8 +197,7 @@
           <div class="in">
             <a-radio
               @click="changeChecked"
-              v-model:checked="checked"
-              :disabled="viewDetail ? true : false"
+              v-model:checked="projectInfo.courseSyncFlag"
               ><span
                 style="
                   width: 100%;
@@ -233,7 +224,7 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect3"
+              v-model:value="projectInfo.level"
               :options="classifyList3"
               @change="classificationChange3"
               placeholder="集团级/组织级/现地级/部门级"
@@ -256,7 +247,7 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect4"
+              v-model:value="projectInfo.systemId"
               :options="classifyList4"
               @change="classificationChange4"
               placeholder="集团级/组织级/现地级/部门级"
@@ -275,7 +266,7 @@
           <div class="in">
             <a-radio
               @click="changeChecked1"
-              v-model:checked="checked1"
+              v-model:checked="projectInfo.boeFlag"
               :disabled="viewDetail ? true : false"
               ><span
                 style="
@@ -308,46 +299,6 @@
                       </div>
                   </div> -->
       </div>
-      <!--  选择模板 ------------------------------ -->
-      <div class="template" style="display: none">
-        <div class="name">
-          <div class="inname" style="width: 50px">模版</div>
-          <div class="in select" style="margin-left: 2px">
-            <a-select
-              v-if="isEdit"
-              disabled="true"
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-            >
-            </a-select>
-            <a-select
-              v-else
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-            >
-            </a-select>
-          </div>
-        </div>
-      </div>
     </div>
     <div class="footer">
       <div class="btn">
@@ -363,10 +314,10 @@
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
-import dayjs from "dayjs";
-import * as api from "../../api/index";
+// import dayjs from "dayjs";
+import * as api from "../../api/indexTemplate";
 import { storage } from "../../api/storage";
-import { toDate } from "../../api/method";
+// import { toDate } from "../../api/method";
 
 export default {
   name: "projectAdd",
@@ -374,126 +325,16 @@ export default {
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const isEdit = ref(false);
-    let peojectID = "";
+    // let peojectID = "";
 
     if (routers.query.projectId) {
       storage.set("projectAddId", routers.query.projectId);
       isEdit.value = true;
-      peojectID = routers.query.projectId;
-      // 需要编辑
-      api
-        .getProjectDetail({ projectId: routers.query.projectId })
-        .then((res) => {
-          if (res.status == 200 && res.data.code == 200) {
-            let info = res.data.data.projectInfo;
-            console.log(info);
-            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-            projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category
-            imageUrl.value = info.picUrl;
-
-            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-            state.rangevalue = [
-              dayjs(start, "YYYY/MM/DD"),
-              dayjs(end, "YYYY/MM/DD"),
-            ];
-
-            let manageName = info.manager.split(",");
-            let manageValue = info.managerId.split(",");
-            let optionsManage = [];
-            for (let i = 0; i < manageName.length; i++) {
-              let obj = {
-                label: manageName[i],
-                value: manageValue[i],
-              };
-              optionsManage.push(obj);
-            }
-            console.log(optionsManage);
-            state.classifySelect1 = optionsManage;
-            state.classifySelect2 =
-              classifyList2.value[info.sourceBelongId - 1];
-            remark.value = info.remark;
-            state.checked = info.boeFlag ? info.boeFlag : false;
-            state.classifySelect3 = classifyList3.value[info.level];
-            state.classifySelect4 = classifyList4.value[info.systemId - 1];
-            state.checked1 = info.boeFlag ? info.boeFlag : false;
-            // fileList1.value = info.attach.split(",");
-
-            projectType = 1;
-            picUrl = info.picUrl;
-            beginTime = Number(info.beginTime / 1000);
-            endTime = Number(info.endTime / 1000);
-            manager = info.manager;
-            managerId = info.managerId;
-            sourceBelongIdC = Number(info.sourceBelongId);
-            courseSyncFlag = info.courseSyncFlag;
-            levels = info.level;
-            systemid = info.systemId;
-            boeFlag = info.boeFlag;
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+      // peojectID = routers.query.projectId;
     } else {
       if (storage.get("projectAddId")) {
         isEdit.value = true;
-        peojectID = storage.get("projectAddId");
-        // 需要编辑
-        api
-          .getProjectDetail({ projectId: storage.get("projectAddId") })
-          .then((res) => {
-            if (res.status == 200 && res.data.code == 200) {
-              let info = res.data.data.projectInfo;
-              console.log("我是从本地存储获取的id", info);
-              projectName.value = info.name;
-              state.classifySelect = classifyList.value[1]; // info.category
-              imageUrl.value = info.picUrl;
-
-              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-              state.rangevalue = [
-                dayjs(start, "YYYY/MM/DD"),
-                dayjs(end, "YYYY/MM/DD"),
-              ];
-
-              let manageName = info.manager.split(",");
-              let manageValue = info.managerId.split(",");
-              let optionsManage = [];
-              for (let i = 0; i < manageName.length; i++) {
-                let obj = {
-                  label: manageName[i],
-                  value: manageValue[i],
-                };
-                optionsManage.push(obj);
-              }
-              console.log(optionsManage);
-              state.classifySelect1 = optionsManage;
-              state.classifySelect2 =
-                classifyList2.value[info.sourceBelongId - 1];
-              remark.value = info.remark;
-              state.checked = info.boeFlag ? info.boeFlag : false;
-              state.classifySelect3 = classifyList3.value[info.level];
-              state.classifySelect4 = classifyList4.value[info.systemId - 1];
-              state.checked1 = info.boeFlag ? info.boeFlag : false;
-
-              projectType = 1;
-              picUrl = info.picUrl;
-              beginTime = Number(info.beginTime / 1000);
-              endTime = Number(info.endTime / 1000);
-              manager = info.manager;
-              managerId = info.managerId;
-              sourceBelongIdC = Number(info.sourceBelongId);
-              courseSyncFlag = info.courseSyncFlag;
-              levels = info.level;
-              systemid = info.systemId;
-              boeFlag = info.boeFlag;
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
+        // peojectID = storage.get("projectAddId");
       }
     }
 
@@ -501,7 +342,7 @@ export default {
       storage.remove("projectAddId");
       setTimeout(() => {
         router.push({
-          path: "/libraryAdd",
+          path: "/manage/libraryAdd",
         });
       }, 400);
     };
@@ -526,6 +367,19 @@ export default {
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
       viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+      projectInfo:{
+        beginTime:null,
+        endTime:null,
+        name: null,
+        manager: null,
+        notice: null,
+        sourceBelongId: null,
+        remark: "",
+        courseSyncFlag: false,
+        level: null,
+        systemId: null,
+        boeFlag: false,
+      }
     });
 
     const projectName = ref("");
@@ -536,11 +390,11 @@ export default {
       { value: 3, label: "产业人" },
     ]);
 
-    let projectType = "";
+    // let projectType = "";
 
     const classificationChange = (value) => {
       console.log(`selected ${value}`);
-      projectType = value;
+      // projectType = value;
     };
 
     function getBase64(img, callback) {
@@ -553,7 +407,7 @@ export default {
     const fileList1 = ref([]);
     const loading = ref(false);
     const imageUrl = ref("");
-    let picUrl = "";
+    // let picUrl = "";
 
     const handleChange = (info) => {
       if (info.file.status === "uploading") {
@@ -562,7 +416,7 @@ export default {
       }
       if (info.file.status === "done") {
         console.log("上传图片返回的信息 %o", info);
-        picUrl = info.file.response.data;
+        // picUrl = info.file.response.data;
         // Get this url from response in real world.
         getBase64(info.file.originFileObj, (base64Url) => {
           imageUrl.value = base64Url;
@@ -577,7 +431,7 @@ export default {
 
     let uplodaFileCount = false;
 
-    let attach = "";
+    // let attach = "";
     let attachData = "";
     const handleChange1 = (info) => {
       if (info.file.status === "uploading") {
@@ -602,7 +456,7 @@ export default {
           }
         }
         console.log(attachStr);
-        attach = attachStr;
+        // attach = attachStr;
 
         if (info.fileList.length > 5) {
           uplodaFileCount = true;
@@ -639,8 +493,6 @@ export default {
       });
     };
 
-    let beginTime = "";
-    let endTime = "";
     const dateFormatList = ["YYYY/MM/DD"];
 
     const onRangeChange = (value, dateString) => {
@@ -651,8 +503,8 @@ export default {
         "Formatted Selected TimeStamp",
         new Date(dateString[0]).getTime()
       );
-      beginTime = new Date(dateString[0]).getTime() / 1000;
-      endTime = new Date(dateString[1]).getTime() / 1000;
+      // beginTime = new Date(dateString[0]).getTime() / 1000;
+      // endTime = new Date(dateString[1]).getTime() / 1000;
     };
 
     // 项目经理 后续接口调用
@@ -662,8 +514,6 @@ export default {
       { value: 3, label: "刘孟君" },
     ]);
 
-    let manager = "";
-    let managerId = "";
     const classificationChange1 = (key, options) => {
       console.log(`selected ${key}`, options);
       let mstr = "";
@@ -686,8 +536,8 @@ export default {
         }
       }
       state.classifySelect1 = newoptions;
-      manager = mstr;
-      managerId = midstr;
+      // manager = mstr;
+      // managerId = midstr;
     };
 
     // 资源归属 sourceBelongId 后续给接口
@@ -697,10 +547,10 @@ export default {
       { value: 3, label: "项目三" },
     ]);
 
-    let sourceBelongIdC = "";
+    // let sourceBelongIdC = "";
     const classificationChange2 = (key) => {
       console.log(`selected ${key}`, classifyList2);
-      sourceBelongIdC = key;
+      // sourceBelongIdC = key;
     };
 
     // 项目级别
@@ -711,10 +561,10 @@ export default {
       { value: 4, label: "部门级" },
     ]);
 
-    let levels = "";
+    // let levels = "";
     const classificationChange3 = (key) => {
       console.log(`selected ${key}`, classifyList3);
-      levels = key;
+      // levels = key;
     };
 
     // 培训体系
@@ -725,112 +575,11 @@ export default {
       { value: 4, label: "部门级" },
     ]);
 
-    let systemid = "";
+    // let systemid = "";
     const classificationChange4 = (key) => {
       console.log(`selected ${key}`, classifyList4);
-      systemid = key;
+      // systemid = key;
     };
-
-    // 模版
-    const classifyList5 = ref([
-      // { value: 1, label: "模版一" },
-      // { value: 2, label: "模版二" },
-      // { value: 3, label: "模版三" },
-      // { value: 4, label: "模版四" },
-    ]);
-    const classificationChange5 = (key) => {
-      console.log(`selected ${key}`, classifyList5.value);
-      //获取模版信息
-      let obj = {
-        projectId: Number(key),
-      };
-      api
-        .getProjectDetail(obj)
-        .then((res) => {
-          console.log("获取项目详情", res);
-          if (res.status === 200) {
-            let info = res.data.data.projectInfo;
-            console.log(info);
-            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-            projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category
-            imageUrl.value = info.picUrl;
-
-            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-            state.rangevalue = [
-              dayjs(start, "YYYY/MM/DD"),
-              dayjs(end, "YYYY/MM/DD"),
-            ];
-
-            let manageName = info.manager.split(",");
-            let manageValue = info.managerId.split(",");
-            let optionsManage = [];
-            for (let i = 0; i < manageName.length; i++) {
-              let obj = {
-                label: manageName[i],
-                value: manageValue[i],
-              };
-              optionsManage.push(obj);
-            }
-            console.log(optionsManage);
-            state.classifySelect1 = optionsManage;
-            state.classifySelect2 =
-              classifyList2.value[info.sourceBelongId - 1];
-            remark.value = info.remark;
-            state.checked = info.boeFlag ? info.boeFlag : false;
-            state.classifySelect3 = classifyList3.value[info.level];
-            state.classifySelect4 = classifyList4.value[info.systemId - 1];
-            state.checked1 = info.boeFlag ? info.boeFlag : false;
-            // fileList1.value = info.attach.split(",");
-
-            projectType = 1;
-            picUrl = info.picUrl;
-            beginTime = Number(info.beginTime / 1000);
-            endTime = Number(info.endTime / 1000);
-            manager = info.manager;
-            managerId = info.managerId;
-            sourceBelongIdC = Number(info.sourceBelongId);
-            courseSyncFlag = info.courseSyncFlag;
-            levels = info.level;
-            systemid = info.systemId;
-            boeFlag = info.boeFlag;
-          }
-        })
-        .catch((err) => {
-          console.log("获取详情失败", err);
-        });
-    };
-    //获取模版列表
-    const getTemplate = () => {
-      let obj = {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        // projectId:id?id:''
-      };
-      api
-        .getProjectList(obj)
-        .then((res) => {
-          console.log("获取模版列表", res);
-          state.totalPages = Number(res.data.data.pages);
-          if (res.status === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList5.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.projectId,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            classifyList5.value = array;
-          }
-        })
-        .catch((err) => {
-          console.log("获取模版列表失败", err);
-        });
-    };
-    getTemplate();
     //模版滚动加载信息
     const templateScroll = (e) => {
       // console.log("滚动", e, b);
@@ -845,48 +594,30 @@ export default {
         if (state.currentPage < state.totalPages) {
           // 如果滑到底部，则加载下一页
           state.currentPage++;
-          getTemplate();
         }
       }
     };
 
-    // 项目说明
-    const remark = ref("");
+    // const removeFile = (file) => {
+    //   const index = fileList1.value.indexOf(file);
+    //   const newFileList = fileList1.value.slice();
+    //   newFileList.splice(index, 1);
+    //   fileList1.value = newFileList;
 
-    let courseSyncFlag = 0;
-    const changeChecked = () => {
-      console.log(state.checked);
-      state.checked ? (state.checked = false) : (state.checked = true);
-      courseSyncFlag = state.checked ? 1 : 0;
-    };
-
-    let boeFlag = 0;
-    const changeChecked1 = () => {
-      console.log(state.checked1);
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-      boeFlag = state.checked1 ? 1 : 0;
-    };
-
-    const removeFile = (file) => {
-      const index = fileList1.value.indexOf(file);
-      const newFileList = fileList1.value.slice();
-      newFileList.splice(index, 1);
-      fileList1.value = newFileList;
-
-      let attachStr = "";
-      if (newFileList.length == 0) {
-        attachStr = "";
-      }
-      for (let i = 0; i < fileList1["value"].length; i++) {
-        console.log(fileList1["value"][i].response.data);
-        if (fileList1["value"].length - 1 == i) {
-          attachStr += fileList1["value"][i].response.data;
-        } else {
-          attachStr += fileList1["value"][i].response.data + ",";
-        }
-      }
-      attach = attachStr;
-    };
+    //   let attachStr = "";
+    //   if (newFileList.length == 0) {
+    //     attachStr = "";
+    //   }
+    //   for (let i = 0; i < fileList1["value"].length; i++) {
+    //     console.log(fileList1["value"][i].response.data);
+    //     if (fileList1["value"].length - 1 == i) {
+    //       attachStr += fileList1["value"][i].response.data;
+    //     } else {
+    //       attachStr += fileList1["value"][i].response.data + ",";
+    //     }
+    //   }
+    //   attach = attachStr;
+    // };
 
     const errorMsgs = {
       name: "请输入项目名称",
@@ -903,31 +634,25 @@ export default {
     };
 
     const createProject = () => {
-      console.log("我是否要编辑项目", isEdit.value);
-      if (isEdit.value) {
-        console.log("我要编辑项目", peojectID);
+      console.log("我要编辑项目", isEdit.value);
         let obj = {
-          projectId: Number(peojectID),
-          name: projectName["value"],
-          category: projectType,
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 0,
-          parentId: 0,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
+          "beginTime": 0,
+          "boeFlag": 0,
+          "category": 0,
+          "courseSyncFlag": 0,
+          "endTime": 0,
+          "level": 0,
+          "manager": "",
+          "managerId": "",
+          "name": "",
+          "notice": "",
+          "noticeFlag": 0,
+          "picUrl": "",
+          "projectTemplateId": 0,
+          "remark": "",
+          "sourceBelongId": 0,
+          "status": 0,
+          "systemId": 0
         };
 
         console.log(obj);
@@ -940,9 +665,8 @@ export default {
             return;
           }
         }
-
         api
-          .createProject(obj)
+          .templateEdit(obj)
           .then((res) => {
             console.log(res);
             if (res.status == 200 && res.data.code == 200) {
@@ -950,7 +674,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/projectmanage",
+                  path: "/manage/projectmanage",
                 });
               }, 1000);
             } else {
@@ -963,64 +687,37 @@ export default {
             message.destroy();
             message.error("编辑失败，请检查当前网络状态。");
           });
-      } else {
-        let obj = {
-          name: projectName["value"],
-          category: projectType,
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 10,
-          parentId: 0,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
-        };
-        console.log("提交的数据格式 %o", obj);
-        for (let i in errorMsgs) {
-          console.log(obj[i]);
-          if (obj[i] === "" || obj[i] === undefined) {
-            message.destroy();
-            message.warning(errorMsgs[i]);
-            return;
-          }
-        }
-
-        api
-          .createProject(obj)
-          .then((res) => {
-            console.log(res);
-            if (res.status == 200 && res.data.code == 200) {
-              message.destroy();
-              message.success("创建成功");
-              setTimeout(() => {
-                router.push({
-                  path: "/taskpage",
-                  query: { id: res.data.data.projectId },
-                });
-              }, 1000);
-            } else {
-              message.destroy();
-              message.error("创建失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("创建失败，请检查当前网络状态。");
-          });
-      }
+      
     };
+        // 编辑项目模板
+      const editTemplate = () => {
+        let obj = {
+        "beginTime": state.projectInfo.time,
+        "boeFlag": state.projectInfo.boeFlag,
+        "category": 0,
+        "courseSyncFlag": state.projectInfo.courseSyncFlag,
+        "endTime": state.projectInfo.time,
+        "level": state.projectInfo.level,
+        "manager": state.projectInfo.manager,
+        "managerId": "",
+        "name": state.projectInfo.name,
+        "notice": "",
+        "noticeFlag": 0,
+        "picUrl": "",
+        "projectTemplateId": 0,
+        "remark": state.projectInfo.remark,
+        "sourceBelongId": state.projectInfo.sourceBelongId,
+        "status": 0,
+        "systemId": state.projectInfo.systemId
+      };
+      api.templateEdit(obj).methods(obj).then(res => {
+        message.success("编辑成功")
+        console.log(res)
+      }).catch(err => {
+        message.error("编辑失败"+err)
+        console.log(err)
+      })
+    }
 
     return {
       ...toRefs(state),
@@ -1031,7 +728,6 @@ export default {
       classificationChange2,
       classificationChange3,
       classificationChange4,
-      classificationChange5,
       fileList,
       fileList1,
       loading,
@@ -1045,18 +741,13 @@ export default {
       classifyList2,
       classifyList3,
       classifyList4,
-      classifyList5,
-      remark,
-      changeChecked,
-      changeChecked1,
       uplodaFileCount,
       createProject,
-      removeFile,
-
+      // removeFile,
       isEdit,
       backPage,
       dateFormatList,
-
+      editTemplate,
       templateScroll,
     };
   },

From a8153029af8bfaf219e215b51deb5393ddf602e3 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Mon, 21 Nov 2022 18:22:18 +0800
Subject: [PATCH 84/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0publicPath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index d7532e53..b7ca1def 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,20 +8,21 @@
  */
 const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
-  // transpileDependencies: true,
-  devServer: {
-    port: 8080,
-    proxy: {
-      "/manageApi": {
-        // target:"http://192.168.100.208:30001",
-        target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
-        changeOrigin: true, //表示是否改变原域名
-        // secure: false,
-        // ws: false, //表示WebSocket协议
-        pathRewrite: {
-          "^/manageApi": "",
-        },
-      },
-    },
-  },
+	publicPath: '/manage',
+	// transpileDependencies: true,
+	devServer: {
+		port: 8080,
+		proxy: {
+			"/manageApi": {
+				// target:"http://192.168.100.208:30001",
+				target: "http://111.231.196.214:30001/", //这里后台的地址模拟的;应该填写你们真实的后台接口
+				changeOrigin: true, //表示是否改变原域名
+				// secure: false,
+				// ws: false, //表示WebSocket协议
+				pathRewrite: {
+					"^/manageApi": "",
+				},
+			},
+		},
+	},
 });

From efdfb705d50891486a9a227340bfaf5d3330aef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Tue, 22 Nov 2022 17:20:40 +0800
Subject: [PATCH 85/90] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E7=BC=96=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=82=E6=A8=A1=E6=9D=BF=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexTemplate.js                |  4 +-
 src/views/projectcenter/LibraryAdd.vue  |  4 +-
 src/views/projectcenter/temTask.vue     | 92 ++++++++++---------------
 src/views/projectcenter/templateAdd.vue | 53 +++++++++-----
 4 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js
index 212aafee..be42523c 100644
--- a/src/api/indexTemplate.js
+++ b/src/api/indexTemplate.js
@@ -6,9 +6,9 @@ export const templateEdit = (obj) => http.post('/admin/project/template/edit',ob
 // 模板详情
 export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`);
 // 删除阶段
-export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id});
+export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage?stageId=${id}`);
 //删除任务
-export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask`,{projectTaskIds:id}); 
+export const deleteTask = (id) => http.delete(`/admin/project/template/deleteTask?projectTaskIds=${id}`); 
 // 移动任务到阶段
 export const moveTask = (obj) => http.post('/admin/project/template/moveTask',obj);
 // 新建或编辑阶段
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index f44e4414..9ca65c2e 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -55,7 +55,7 @@
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
               <button class="btn" @click="showFaceIn">批量面授报名</button>
-              <router-link to="/manage/temTask" class="edit">
+              <router-link to="/temTask" class="edit">
                 <img
                   class="editimg"
                   src="../../assets/images/projectadd/edit.png"
@@ -848,7 +848,7 @@ export default defineComponent({
     }
     const toEdit = () => {
       routered.push({
-          path: "/manage/templateAdd",
+          path: "/templateAdd",
           query: {
             projectId: state.projectId,
             name: state.name,
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index df5be070..8d8420c9 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -149,7 +149,7 @@
                 <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
               <div class="pub">保存</div>
               <div class="line"></div> -->
-                <router-link to="/manage/taskpage">
+                <router-link to="/taskpage">
                   <div style="display: flex">
                     <img
                       class="img2"
@@ -1041,9 +1041,7 @@
   import AddInvist from "../../components/drawers/AddInvist.vue";
   import AddVote from "../../components/vote/AddVote.vue";
   import { message } from "ant-design-vue";
-  import * as api from "../../api/indexTaskadd";
-  import * as apistage from "../../api/indexStage";
-  import * as apimove from "../../api/indexMovetask";
+  import * as api from "../../api/indexTemplate";
   import draggable from "vuedraggable";
   import { storage } from "../../api/storage";
   import UnlockMode from "../../components/drawers/UnlockMode.vue";
@@ -1317,8 +1315,8 @@
         console.log("data", data);
         data.map((value) => {
           let obj = {
-            id: value.projectTaskId,
-            key: value.projectTaskId,
+            id: value.templateTaskId,
+            key: value.templateTaskId,
             lei:
               value.type == 1
                 ? "在线"
@@ -1351,7 +1349,7 @@
             checked: false, //是否选中类型
             courseId: value.courseId,
             projectId: value.projectId,
-            stageId: value.stageId,
+            templateStageId: value.templateStageId,
             type: value.type,
           };
           array.push(obj);
@@ -1365,11 +1363,11 @@
         let array = [];
         data.map((value) => {
           let obj = {
-            id: value.stageId,
+            id: value.templateStageId,
             tit: value.name,
             name: value.remark,
             taskList: value.taskList,
-            value: value.stageId,
+            value: value.templateStageId,
             label: value.name,
           };
           array.push(obj);
@@ -1491,8 +1489,7 @@
                     <span
                       style="color:#4EA6FF;cursor:pointer"
                       onClick={() => {
-                        showDelete();
-                        state.deleteID = text.record.id;
+                        showDelete(text.record.id);
                       }}
                     >
                       删除
@@ -1508,23 +1505,19 @@
   
       //获取任务列表
       const getTask = () => {
-        // console.log("state.projectId", state.projectId);
-        let obj = {
-          projectId: state.projectId,
-          // projectId: 28,
-        };
+        state.tableData = []
         api
-          .getTask(obj)
+          // .templateDetail(state.projectId || 1)
+          .templateDetail(1)
           .then((res) => {
             if (res.status == 200) {
               console.log("22222", res.data.data.stageList);
-              // console.log("22222", res.data.data.stageList);
-              state.projectTitle = res.data.data.projectInfo.name;
-              state.picUrl = res.data.data.projectInfo.picUrl;
+              state.projectTitle = res.data.data.projectTemplateInfo.name;
+              state.picUrl = res.data.data.projectTemplateInfo.picUrl;
               let leng = res.data.data.stageList.length;
               if (leng > 0) {
-                let stage = localStorage.getItem("stageId")
-                  ? localStorage.getItem("stageId")
+                let stage = localStorage.getItem("templateStageId")
+                  ? localStorage.getItem("templateStageId")
                   : null;
                 console.log("zhaodaole", stage);
                 // console.log("stage",Object.prototype.toString.call(stage))
@@ -1532,7 +1525,7 @@
                 if (stage !== "null") {
                   console.log(stage);
                   let stageList = res.data.data.stageList; //阶段数组
-                  let result = stageList.find((item) => item.stageId == stage);
+                  let result = stageList.find((item) => item.templateStageId == stage);
                   console.log("又找到了", result);
                   getTableData(result.taskList);
                 } else {
@@ -1540,7 +1533,7 @@
                   console.log("任务列表", arr);
                   getTableData(arr);
                   // state.isActive = true;
-                  changebgc(res.data.data.stageList[0].stageId);
+                  changebgc(res.data.data.stageList[0].templateStageId);
                 }
   
                 // 每次都获取了第一条taskList
@@ -1560,13 +1553,13 @@
                 });
               }
               //给阶段id赋初始值
-              let stageid = localStorage.getItem("stageId")
-                ? localStorage.getItem("stageId")
+              let stageid = localStorage.getItem("templateStageId")
+                ? localStorage.getItem("templateStageId")
                 : null;
               if (stageid !== "null") {
                 state.chooseStageId = stageid;
               } else {
-                state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
+                state.chooseStageId = leng > 0 ? stagearr[0].templateStageId : null;
               }
             }
           })
@@ -1589,12 +1582,11 @@
   
       //删除任务
       const deleteTask = () => {
-        let obj = { projectTaskIds: state.deleteID };
         api
-          .deleteTask(obj)
+          .deleteTask(state.deleteID)
           .then((res) => {
             console.log(res, "gggggggggggggggg");
-            // deleteVoteText();
+            getTask()
           })
           .catch((err) => {
             console.log(err);
@@ -1624,10 +1616,10 @@
         } else {
           {
             let obj = {
-              stageId: state.removeStageId,
-              projectTaskId: state.selectRow,
+              templateStageId: state.removeStageId,
+              projectTemplateTaskId: state.selectRow,
             };
-            apimove
+            api
               .moveTask(obj)
               .then((res) => {
                 console.log("移动成功", res);
@@ -1635,7 +1627,7 @@
                 message.success("移动成功");
                 console.log(state.removeStageId);
                 getTask();
-                localStorage.setItem("stageId", state.chooseStageId);
+                localStorage.setItem("templateStageId", state.chooseStageId);
               })
               .catch((err) => {
                 console.log("移动失败", err);
@@ -1648,12 +1640,10 @@
       const deleteTaskAll = () => {
         let arr = state.selectRow;
         console.log("选择的行信息", arr);
-        arr.map((value) => {
-          let obj = {
-            projectTaskIds: value,
-          };
+        arr.map(() => {
+          
           api
-            .deleteTask(obj)
+            .deleteTask(arr)
             .then((res) => {
               console.log(res);
               message.destroy();
@@ -1716,11 +1706,11 @@
         if (state.updateStageID) {
           let obj = {
             name: state.valuesname,
-            projectId: state.projectId,
+            projectTemplateId: 1,
             remark: state.valuesnotice,
-            stageId: state.updateStageID,
+            stageId:state.updateStageID,
           };
-          apistage
+          api
             .editStage(obj)
             .then((res) => {
               console.log("修改阶段成功", res);
@@ -1738,10 +1728,11 @@
         } else {
           let obj = {
             name: state.valuesname,
-            projectId: state.projectId,
+            projectTemplateId: 1,
             remark: state.valuesnotice,
+            stageId:0,
           };
-          apistage
+          api
             .editStage(obj)
             .then((res) => {
               console.log("添加阶段成功", res);
@@ -1771,11 +1762,8 @@
       //删除阶段
       const deleteStage = () => {
         console.log("chapterId", state.deleteStageId);
-        let obj = {
-          stageId: state.deleteStageId,
-        };
-        apistage
-          .deleteStage(obj)
+        api
+          .deleteStage(state.deleteStageId)
           .then((res) => {
             console.log("删除阶段成功", res);
             message.success("删除阶段成功");
@@ -1793,10 +1781,6 @@
         getTask();
       });
       onUpdated(() => {
-        // getTask();
-        // setTimeout(() => {
-        //   getTask();
-        // }, 500);
       });
       onUnmounted(() => {
         document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1960,7 +1944,7 @@
           name: ele.creater,
           projectId: ele.projectId,
           projectTaskId: ele.id,
-          stageId: ele.stageId,
+          templateStageId: ele.templateStageId,
           type: ele.type,
         };
         api
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 05959e27..a763b47d 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -620,8 +620,8 @@ export default {
     // };
 
     const errorMsgs = {
-      name: "请输入项目名称",
-      category: "请选择项目分类",
+      name: "请输入模板名称",
+      category: "请选择模板分类",
       picUrl: "请上传项目封面图",
       beginTime: "请选择项目开始时间",
       endTime: "请选择项目结束时间",
@@ -636,6 +636,38 @@ export default {
     const createProject = () => {
       console.log("我要编辑项目", isEdit.value);
         let obj = {
+          "name": state.projectInfo.name,
+          "category": state.projectInfo.category,
+          "picUrl": "x",
+          "beginTime": state.projectInfo.rangevalue || 1,
+          "endTime": state.projectInfo.rangevalue || 1,
+          "manager": state.projectInfo.manager,
+          "managerId": state.projectInfo.managerId || 0,
+          "sourceBelongId": state.projectInfo.sourceBelongId,
+          "level": state.projectInfo.level,
+          "systemId": state.projectInfo.systemId,
+          "boeFlag": state.projectInfo.boeFlag,
+          "courseSyncFlag": state.projectInfo.courseSyncFlag,
+          "notice": "",
+          "noticeFlag": 0,
+          "projectTemplateId": 0,
+          "remark": "",
+          "status": 0,
+          
+        };
+
+        console.log(obj);
+
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
+        api
+          .templateEdit({
           "beginTime": 0,
           "boeFlag": 0,
           "category": 0,
@@ -653,20 +685,7 @@ export default {
           "sourceBelongId": 0,
           "status": 0,
           "systemId": 0
-        };
-
-        console.log(obj);
-
-        for (let i in errorMsgs) {
-          console.log(obj[i]);
-          if (obj[i] === "" || obj[i] === undefined) {
-            message.destroy();
-            message.warning(errorMsgs[i]);
-            return;
-          }
-        }
-        api
-          .templateEdit(obj)
+        })
           .then((res) => {
             console.log(res);
             if (res.status == 200 && res.data.code == 200) {
@@ -674,7 +693,7 @@ export default {
               message.success("编辑成功");
               setTimeout(() => {
                 router.push({
-                  path: "/manage/projectmanage",
+                  path: "/projectmanage",
                 });
               }, 1000);
             } else {

From a730558682673a91066304bae35be3dab5927610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= <songwc@dongwu-inc.com>
Date: Tue, 22 Nov 2022 18:07:43 +0800
Subject: [PATCH 86/90] =?UTF-8?q?feat:=E5=90=84=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E5=90=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexAudit.js                   |  13 +
 src/api/indexNotice.js                  |   2 +-
 src/components/drawers/ProjectAudit.vue | 412 +++++++++++++++++++++
 src/views/examine/CourseReviewed.vue    | 140 ++++++--
 src/views/examine/CourseReviewedN.vue   | 398 +++++++++++++++++++-
 src/views/examine/ProjectReviewed.vue   | 453 ++++++++++++++++++++++-
 src/views/examine/ProjectReviewedN.vue  | 459 +++++++++++++++++++++++-
 src/views/projectcenter/TaskPage.vue    | 116 +++---
 8 files changed, 1892 insertions(+), 101 deletions(-)
 create mode 100644 src/api/indexAudit.js
 create mode 100644 src/components/drawers/ProjectAudit.vue

diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js
new file mode 100644
index 00000000..c1b3b4db
--- /dev/null
+++ b/src/api/indexAudit.js
@@ -0,0 +1,13 @@
+import http from "./config";
+
+//获取待审核面授课列表
+export const list = (obj) => http.post('/admin/offcourse/list', obj)
+
+//获取待审核项目列表
+export const projlist = (obj) => http.post('/admin/project/list', obj)
+
+//获取已审核项目列表
+export const listView = (obj) => http.post('/admin/project/listView', obj)
+
+//获取面授课已审核列表
+export const courseListView = (obj) => http.post('/admin/offcourse/listReview', obj)
\ No newline at end of file
diff --git a/src/api/indexNotice.js b/src/api/indexNotice.js
index c6eb8fa7..19a34f98 100644
--- a/src/api/indexNotice.js
+++ b/src/api/indexNotice.js
@@ -6,7 +6,7 @@ import http from "./config";
 //     projectId: projectId,
 //   }
 // });
-export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``)
+export const noticeList = (projectId) => http.post(`http://localhost:8080/manageApi/admin/project/noticeList?projectId=` + projectId + ``)
 
 //发布项目公告
 export const publishNotice = (obj) => http.post('/admin/project/publishNotice', obj)
diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
new file mode 100644
index 00000000..e8c0b1c3
--- /dev/null
+++ b/src/components/drawers/ProjectAudit.vue
@@ -0,0 +1,412 @@
+<template>
+  <a-drawer
+    :visible="ProjAuditvisible"
+    class="drawerStyle ProjectAudit"
+    placement="right"
+    width="60%"
+    @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="main" style="padding-right: 10px">
+        <a-tabs v-model:activeKey="activeSetKey">
+          <a-tab-pane key="1" tab="基本信息">
+            <div class="content7" v-if="showDetail">
+              <div class="set_body">
+                <div class="set_content">
+                  <div class="setc_name"><span>项目名称：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999">{{ name }}</span>
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>封面图：</span></div>
+                  <div class="setc_main">
+                    <img
+                      style="width: 151px; height: 84px"
+                      :src="picUrl"
+                      alt=""
+                    />
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>项目时间：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999"
+                      >{{ startTime }} ～ {{ endTime }}</span
+                    >
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>项目经理：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999">{{ manager }}</span>
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>资源归属：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999">{{ sourceBelong }}</span>
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>项目说明：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999">{{ remark }}</span>
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>同步学习记录：</span></div>
+                  <div class="setc_main">
+                    <a-radio v-model:checked="checkedSty"
+                      ><span style="color: #333333"
+                        >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                    >
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>项目级别：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999">{{ level }}</span>
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>培训体系：</span></div>
+                  <div class="setc_main">
+                    <span style="color: #999999">{{ systemId }}</span>
+                  </div>
+                </div>
+                <div class="set_content">
+                  <div class="setc_name"><span>是否BOEU实施：</span></div>
+                  <div class="setc_main">
+                    <a-radio v-model:checked="checkedBOEU"
+                      ><span style="color: #333333">BOEU实施</span></a-radio
+                    >
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="detaile">
+              <button class="debtn" @click="changeDe">
+                详情{{ showDetail ? "折叠" : "展开" }}
+              </button>
+            </div>
+
+            <div class="audit">
+              <div class="set_content">
+                <div class="setc_name"><span>审核：</span></div>
+                <div class="setc_main">
+                  <a-radio-group v-model:value="valuePass">
+                    <a-radio value="1">通过</a-radio>
+                    <a-radio value="2">不通过</a-radio>
+                  </a-radio-group>
+                </div>
+              </div>
+              <div class="set_content">
+                <div class="setc_name"><span>审核意见：</span></div>
+                <div class="setc_main">
+                  <a-textarea v-model:value="valueSuggest" :rows="4" />
+                </div>
+              </div>
+            </div>
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="修改记录"> </a-tab-pane>
+        </a-tabs>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { toRefs, reactive } from "vue";
+import { getTask } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
+export default {
+  name: "ProjectAudit",
+  components: {},
+  props: {
+    ProjAuditvisible: {
+      type: Boolean,
+      default: false,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+  },
+
+  setup(props, ctx) {
+    const state = reactive({
+      activeSetKey: "1",
+      checkedBOEU: false, //是否BOEU实施
+      checkedSty: false, //同步学习记录
+      showDetail: false,
+      valuePass: "1",
+      valueSuggest: null,
+      //基本信息
+      name: null, //项目名称 未改
+      startTime: null, //开始时间 已改
+      tstartTime: null, //开始事件 未改
+      endTime: null, //结束时间 已改
+      tendTime: null, //结束时间 未改
+      manager: null, //项目经理 未改
+      sourceBelong: null, //资源归属 已改
+      tsourceBelong: null, //资源归属 未改
+      remark: null, //项目说明 未改
+      level: null, //项目级别  已改
+      tlevel: null, //项目级别 未改
+      systemId: null, //培训分类
+      tsystemId: null, //培训分类 未改
+      picUrl: null, //未改
+      parentId: null, //未改
+      courseSyncFlag: null, //未改
+      boeFlag: null, //未改
+      managerId: null, //未改
+      notice: null, //未改
+      status: null, //未改
+      type: null, //未改
+      category: null, //未改
+      noticeFlag: null, //未改
+      templateId: null, //未改
+      attach: null,
+    });
+
+    const closeDrawer = () => {
+      ctx.emit("update:ProjAuditvisible", false);
+      state.valueSuggest = null;
+    };
+
+    //获取项目信息
+    const getTaskInfo = () => {
+      getTask({
+        // 先使用了固定projectId
+        projectId: 37,
+      }).then((res) => {
+        console.log("get task", res.data.data);
+        let info = res.data.data.projectInfo;
+        let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
+        let end = toDate(info.endTime / 1000, "Y-M-D h:m");
+        state.tstartTime = info.beginTime;
+        state.tendTime = info.endTime;
+        state.tsourceBelong = info.sourceBelongId;
+        state.parentId = info.parentId;
+        state.name = info.name;
+        state.startTime = start;
+        state.endTime = end;
+        state.manager = info.manager;
+        state.remark = info.remark;
+        state.level =
+          info.level == 1
+            ? "集团级"
+            : info.level == 2
+            ? "组织级"
+            : info.level == 3
+            ? "现地级"
+            : info.level == 4
+            ? "部门级"
+            : "-";
+        state.tlevel = info.level;
+        state.systemId =
+          info.systemId == 1
+            ? "集团级"
+            : info.systemId == 2
+            ? "组织级"
+            : info.systemId == 3
+            ? "现地级"
+            : info.systemId == 4
+            ? "部门级"
+            : "-";
+        state.tsystemId = info.systemId;
+        state.checkedSty = info.courseSyncFlag == 1 ? true : false;
+        state.courseSyncFlag = info.courseSyncFlag;
+        state.checkedBOEU = info.boeFlag == 1 ? true : false;
+        state.boeFlag = info.boeFlag;
+        state.picUrl = info.picUrl;
+        state.managerId = info.managerId;
+        state.notice = info.notice;
+        state.status = info.status;
+        state.type = info.type;
+        state.category = info.category;
+        state.noticeFlag = info.noticeFlag;
+        // state.attach = info.attach;
+        // state.templateId = info.templateId;
+        state.sourceBelong =
+          info.sourceBelongId == 1
+            ? "项目一"
+            : info.sourceBelongId == 2
+            ? "项目二"
+            : info.sourceBelongId == 3
+            ? "项目三"
+            : "-";
+      });
+    };
+
+    const afterVisibleChange = () => {
+      getTaskInfo();
+    };
+    const changeDe = () => {
+      state.showDetail = !state.showDetail;
+    };
+
+    return {
+      ...toRefs(state),
+      closeDrawer,
+      afterVisibleChange,
+      getTaskInfo,
+      changeDe,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.ProjectAudit {
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    // overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      flex-shrink: 0;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      width: 100%;
+      height: 100%;
+      // background-color: #bfa;
+      overflow-y: auto;
+      padding-right: 10px;
+      .content7 {
+        margin-top: 20px;
+
+        .set_tit {
+          margin-left: 34px;
+          font-size: 18px;
+          font-weight: 500;
+          color: #232425;
+        }
+
+        .line {
+          width: 100%;
+          height: 1px;
+          background-color: #e8e8e8;
+          margin-top: 10px;
+        }
+
+        .set_body {
+          margin-left: 34px;
+          margin-right: 34px;
+          position: relative;
+
+          .edit {
+            position: absolute;
+            width: 100px;
+            height: 40px;
+            background: #388be1;
+            border-radius: 8px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            right: 0;
+            cursor: pointer;
+
+            .img {
+              width: 18px;
+              height: 18px;
+              background-image: url(../../assets/images/basicinfo/edit.png);
+              background-size: 100%;
+              margin-right: 7px;
+            }
+
+            .ed {
+              font-size: 14px;
+              font-weight: 400;
+              color: #ffffff;
+            }
+          }
+
+          .set_content {
+            margin: 32px auto;
+            display: flex;
+
+            // justify-content: end;
+            .setc_name {
+              width: 150px;
+              display: flex;
+              justify-content: end;
+            }
+
+            .setc_main {
+              flex: 1;
+              margin-left: 12px;
+            }
+          }
+        }
+      }
+      .detaile {
+        width: 100%;
+        // background-color: blue;
+        display: flex;
+        justify-content: center;
+        .debtn {
+          width: 130px;
+          height: 40px;
+          border: 0;
+          border-radius: 4px;
+          cursor: pointer;
+        }
+      }
+      .audit {
+        margin-left: 34px;
+        margin-right: 34px;
+        position: relative;
+        .set_content {
+          margin: 32px auto;
+          display: flex;
+
+          // justify-content: end;
+          .setc_name {
+            width: 150px;
+            display: flex;
+            justify-content: end;
+          }
+
+          .setc_main {
+            flex: 1;
+            margin-left: 12px;
+            textarea {
+              border-radius: 4px !important;
+              resize: none;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 99a1c9c6..3a4855b4 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -16,7 +16,7 @@
             <div class="inpbox1">
               <a-select
                 v-model:value="valueproj"
-                placeholder="请输入内容分类"
+                placeholder="请选择内容分类"
                 @change="handleChangeproj"
                 :options="optionsproj"
               />
@@ -48,11 +48,11 @@
           </div>
         </div>
         <div class="tmplh_btn">
-          <div class="btn btn1">
+          <div class="btn btn1" @click="search">
             <div class="search"></div>
             <div class="btnText btnText1">搜索</div>
           </div>
-          <div class="btn btn2">
+          <div class="btn btn2" @click="reset">
             <div class="search"></div>
             <div class="btnText btnText2">重置</div>
           </div>
@@ -66,16 +66,31 @@
             :loading="tableDataTotal === -1 ? true : false"
             expandRowByClick="true"
             @expand="expandTable"
+            :scroll="{ x: 1300 }"
             :pagination="false"
           />
         </div>
+        <div class="tableBox">
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              show-quick-jumper
+              :pageSize="pageSize"
+              v-model:current="currentPage"
+              :total="total"
+              class="pagination"
+              @change="changePagination"
+            />
+          </div>
+        </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
-
+import { reactive, toRefs, onMounted } from "vue";
+import { courseListView } from "../../api/indexAudit";
 export default {
   name: "CoursereViewed",
 
@@ -83,18 +98,20 @@ export default {
     const state = reactive({
       optionsproj: [
         {
-          value: "jack",
+          value: "0",
           label: "Jack",
         },
         {
-          value: "rose",
+          value: "1",
           label: "rose",
         },
       ],
       valueproj: null,
       valuecreater: null,
       valuename: null,
-
+      currentPage: 1,
+      total: null,
+      pageSize: 10,
       columns1: [
         {
           title: "序号",
@@ -155,21 +172,92 @@ export default {
         },
       ],
       tableData1: [
-        {
-          number: "1",
-          name: "课程1",
-          type: "在线",
-          content: "领导力/领导业务",
-          status: "通过",
-          creater: "-",
-          time: "-",
-          msg: "-",
-        },
+        // {
+        //   number: "1",
+        //   name: "课程1",
+        //   type: "在线",
+        //   content: "领导力/领导业务",
+        //   status: "通过",
+        //   creater: "-",
+        //   time: "-",
+        //   msg: "-",
+        // },
       ],
     });
-
+    const getList = (obj) => {
+      let objn = obj || {
+        auditStatus: 0,
+        categoryId: 0,
+        createName: "",
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+      };
+      courseListView(objn)
+        .then((res) => {
+          console.log("获取已审核课程成功", res);
+          let result = res.data.data.rows;
+          state.total = res.data.data.total;
+          setTableData(result);
+        })
+        .catch((err) => {
+          console.log("获取已审核课程失败", err);
+        });
+    };
+    const setTableData = (table) => {
+      let data = table;
+      let array = [];
+      data.map((item) => {
+        let obj = {
+          number: item.offcourseId,
+          name: item.name,
+          type: item.type == 1 ? "线上" : "线下",
+          content: item.categoryId,
+          status: item.auditStatus == 2 ? "通过" : "拒绝",
+          creater: item.createName,
+          time: "-",
+          msg: item.description,
+        };
+        array.push(obj);
+      });
+      state.tableData1 = array;
+    };
+    const search = () => {
+      let obj = {
+        auditStatus: 0,
+        categoryId: state.valueproj,
+        createName: state.valuecreater,
+        name: state.valuename,
+        pageNo: state.currentPage,
+        pageSize: 10,
+      };
+      getList(obj);
+    };
+    const reset = () => {
+      (state.valueproj = null),
+        (state.valuecreater = null),
+        (state.valuename = null),
+        getList();
+    };
+    const handleChangeproj = (value, item) => {
+      console.log(value, item);
+      state.valueproj = item.value;
+    };
+    const changePagination = (pagina) => {
+      state.currentPage = pagina;
+      getList();
+    };
+    onMounted(() => {
+      getList();
+    });
     return {
       ...toRefs(state),
+      getList,
+      setTableData,
+      search,
+      handleChangeproj,
+      reset,
+      changePagination,
     };
   },
 };
@@ -191,11 +279,13 @@ export default {
         .inpbox {
           display: flex;
           margin-top: 32px;
+          flex-wrap: wrap;
           .inpbox1 {
             display: flex;
             justify-content: center;
             align-items: center;
             margin-right: 24px;
+            margin-top: 10px;
             .ant-select-selector {
               border-radius: 8px;
               width: 270px;
@@ -210,8 +300,8 @@ export default {
       }
       .tmplh_btn {
         display: flex;
-        margin-left: 38px;
-        margin-top: 32px;
+        // margin-left: 38px;
+        margin-top: 42px;
         .btn {
           padding: 0px 26px 0px 26px;
           height: 38px;
@@ -219,7 +309,7 @@ export default {
           display: flex;
           align-items: center;
           justify-content: center;
-          margin-left: 14px;
+          margin-right: 14px;
           cursor: pointer;
           flex-shrink: 0;
           .search {
@@ -296,6 +386,12 @@ export default {
           }
         }
       }
+      .pa {
+        width: 100%;
+        margin-top: 20px;
+        display: flex;
+        justify-content: center;
+      }
     }
   }
 }
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index d0635b09..56f0810c 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -6,34 +6,416 @@
  * @FilePath: /fe-manage/src/views/examine/CourseReviewedN.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
-<!-- 待审核课程页面 -->
+<!-- 待审核课程页面 coursereviewedn-->
 <template>
   <div class="coursereviewedn">
-  
+    <div class="tmpl">
+      <div class="tmpl_header">
+        <div class="tmplh_inp">
+          <div class="inpbox">
+            <div class="inpbox1">
+              <a-select
+                v-model:value="valueproj"
+                placeholder="请选择内容分类"
+                @change="handleChangeproj"
+                :options="optionsproj"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuecreater"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入创建人"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuename"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入名称"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="tmplh_btn">
+          <div class="btn btn1" @click="search">
+            <div class="search"></div>
+            <div class="btnText btnText1">搜索</div>
+          </div>
+          <div class="btn btn2" @click="reset">
+            <div class="search"></div>
+            <div class="btnText btnText2">重置</div>
+          </div>
+        </div>
+      </div>
+      <div class="tmpl_body">
+        <div class="tmpl_tabbox">
+          <a-table
+            :columns="columns1"
+            :data-source="tableData1"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :scroll="{ x: 1300 }"
+            :pagination="false"
+          />
+        </div>
+        <div class="tableBox">
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              show-quick-jumper
+              :pageSize="pageSize"
+              v-model:current="currentPage"
+              :total="total"
+              class="pagination"
+              @change="changePagination"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
-import { reactive, toRefs, } from "vue";
+import { reactive, toRefs, onMounted } from "vue";
+import { list } from "../../api/indexAudit";
+import { toDate } from "../../api/method";
 
 export default {
   name: "CoursereViewedN",
 
   setup() {
     const state = reactive({
-    
+      optionsproj: [
+        {
+          value: "jack",
+          label: "Jack",
+        },
+        {
+          value: "rose",
+          label: "rose",
+        },
+      ],
+      valueproj: null,
+      valuecreater: null,
+      valuename: null,
+      // currentFacePage: 1,
+      currentPage: 1,
+      total: null,
+      pageSize: 10,
+      columns1: [
+        {
+          title: "序号",
+          dataIndex: "number",
+          key: "number",
+          align: "center",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          align: "center",
+        },
+        {
+          title: "类型",
+          dataIndex: "type",
+          key: "type",
+          align: "center",
+        },
+        {
+          title: "内容分类",
+          dataIndex: "content",
+          key: "content",
+          align: "center",
+        },
+        {
+          title: "状态",
+          dataIndex: "status",
+          key: "status",
+          align: "center",
+        },
+        {
+          title: "转审",
+          dataIndex: "change",
+          key: "change",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creater",
+          key: "creater",
+          align: "center",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+        },
+
+        {
+          title: "操作",
+          dataIndex: "opt",
+          key: "opt",
+          align: "center",
+          customRender: () => {
+            return (
+              <div>
+                <span style="cursor:pointer">审核</span>&nbsp;
+                <span style="cursor:pointer">预览</span>
+              </div>
+            );
+          },
+        },
+      ],
+      tableData1: [
+        {
+          number: "1",
+          name: "课程1",
+          type: "在线",
+          content: "领导力/领导业务",
+          status: "待审核",
+          change: "",
+          creater: "-",
+          time: "-",
+        },
+        {
+          number: "2",
+          name: "面授课程",
+          type: "在线",
+          content: "领导力/领导业务",
+          status: "待审核",
+          change: "已转审",
+          creater: "-",
+          time: "-",
+        },
+      ],
     });
 
-   
+    const getFaceList = (obj) => {
+      let objn = obj || {
+        auditStatus: 1,
+        beginTime: 0,
+        categoryId: 0,
+        createName: "",
+        endTime: 0,
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectName: "",
+      };
+      list(objn)
+        .then((res) => {
+          console.log("获取面授列表成功", res);
+          let result = res.data.data;
+          state.total = result.total;
+          if (result.total > 0) {
+            setFaceData(result.rows);
+          }
+        })
+        .catch((err) => {
+          console.log("获取面授列表失败", err);
+        });
+    };
+    const setFaceData = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((item) => {
+        let obj = {
+          number: item.offcourseId,
+          name: item.name,
+          type: item.type == 1 ? "线上" : "线下",
+          content: item.categoryId,
+          status: "待审核",
+          change: "-",
+          creater: item.createName,
+          time: toDate(item.createTime, "Y-M-D h-m"),
+        };
+        array.push(obj);
+      });
+      state.tableData1 = array;
+    };
+    const reset = () => {
+      state.valueproj = null;
+      state.valuecreater = null;
+      state.valuename = null;
+      getFaceList();
+    };
+    const search = () => {
+      let obj = {
+        auditStatus: 1,
+        beginTime: 0,
+        categoryId: state.valueproj,
+        createName: state.valuecreater,
+        endTime: 0,
+        name: state.valuename,
+        pageNo: state.currentPage,
+        pageSize: 10,
+        projectName: "",
+      };
+      getFaceList(obj);
+    };
+    const changePagination = (pagina) => {
+      state.currentPage = pagina;
+      getFaceList();
+    };
+    onMounted(() => {
+      getFaceList();
+    });
     return {
       ...toRefs(state),
-      
+      getFaceList,
+      setFaceData,
+      search,
+      reset,
+      changePagination,
     };
   },
 };
 </script>
 <style lang="scss">
 .coursereviewedn {
- 
-}
+  width: 100%;
+  .tmpl {
+    width: 100%;
+    .tmpl_header {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      margin-bottom: 32px;
 
+      margin-left: 32px;
+      margin-right: 32px;
+      .tmplh_inp {
+        .inpbox {
+          display: flex;
+          margin-top: 32px;
+          flex-wrap: wrap;
+          .inpbox1 {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-right: 24px;
+            margin-top: 10px;
+            .ant-select-selector {
+              border-radius: 8px;
+              width: 270px;
+              height: 40px;
+              padding-top: 5px;
+            }
+            span {
+              white-space: nowrap;
+            }
+          }
+        }
+      }
+      .tmplh_btn {
+        display: flex;
+        // margin-left: 38px;
+        margin-top: 42px;
+        .btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          cursor: pointer;
+          flex-shrink: 0;
+          .search {
+            background-size: 100%;
+          }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+          .btnText1 {
+            color: rgb(255, 255, 255);
+          }
+          .btnText2 {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn1 {
+          background: #409eff;
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+        }
+        .btn2 {
+          background: #ffffff;
+          border: 1px solid #388be1;
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset1.png");
+          }
+        }
+        .btn1:hover {
+          background: rgb(255, 255, 255);
+          border: 1px solid #388be1;
+          .search {
+            background-image: url("../../assets/images/courseManage/search1.png");
+          }
+          .btnText {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn2:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+          .btnText {
+            color: #ffffff;
+          }
+        }
+      }
+    }
+    .tmpl_body {
+      padding: 0px 30px;
+      .tmpl_tabbox {
+        .operation {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #4ea6ff;
+          .nselect {
+            justify-content: center;
+            align-items: center;
+            display: flex;
+            .jc {
+              margin-left: 20px;
+              white-space: nowrap;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+      .pa {
+        width: 100%;
+        margin-top: 20px;
+        display: flex;
+        justify-content: center;
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index d8cf1d7b..20882d2a 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -6,26 +6,471 @@
  * @FilePath: /fe-manage/src/views/examine/ProjectReviewed.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
-<!-- 已审核项目页面 -->
+<!-- 已审核项目页面 projectviewed-->
 <template>
-  <div class="projectviewed"></div>
+  <div class="projectviewed">
+    <div class="tmpl">
+      <div class="tmpl_header">
+        <div class="tmplh_inp">
+          <div class="inpbox">
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valueproj"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入项目名称/所属项目"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuename"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入项目经理"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuecreater"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入创建人"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-range-picker
+                v-model:value="valueDate"
+                style="border-radius: 8px; height: 40px; margin-left: 5px"
+                :placeholder="['      开始时间', '        结束时间']"
+                @change="rankTimeChange"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-select
+                v-model:value="valuestate"
+                placeholder="请选择审核状态"
+                @change="handleChangeproj"
+                :options="optionsproj"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="tmplh_btn">
+          <div class="btn btn1" @click="search">
+            <div class="search"></div>
+            <div class="btnText btnText1">搜索</div>
+          </div>
+          <div class="btn btn2" @click="reset">
+            <div class="search"></div>
+            <div class="btnText btnText2">重置</div>
+          </div>
+        </div>
+      </div>
+      <div class="tmpl_body">
+        <div class="tmpl_tabbox">
+          <a-table
+            :columns="columns1"
+            :data-source="tableData1"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :scroll="{ x: 1300 }"
+            :pagination="false"
+          />
+        </div>
+        <div class="tableBox">
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              show-quick-jumper
+              :pageSize="pageSize"
+              v-model:current="currentPage"
+              :total="total"
+              class="pagination"
+              @change="changePagination"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, onMounted } from "vue";
+import { listView } from "../../api/indexAudit";
+import { toDate } from "@/api/method";
+import dayjs from "dayjs";
 
 export default {
   name: "ProjectViewed",
 
   setup() {
-    const state = reactive({});
+    const state = reactive({
+      optionsproj: [
+        {
+          value: "jack",
+          label: "Jack",
+        },
+        {
+          value: "rose",
+          label: "rose",
+        },
+      ],
+      valueproj: null,
+      valuecreater: null,
+      valuename: null,
+      valueDate: [],
+      valuestate: null,
+      currentPage: 1,
+      total: null,
+      pageSize: 10,
+      columns1: [
+        {
+          title: "序号",
+          dataIndex: "number",
+          key: "number",
+          align: "center",
+        },
+        {
+          title: "项目名称",
+          dataIndex: "name",
+          key: "name",
+          align: "center",
+        },
+
+        {
+          title: "所属项目",
+          dataIndex: "belong",
+          key: "belong",
+          align: "center",
+          width: "10%",
+        },
+        {
+          title: "项目经理",
+          dataIndex: "manager",
+          key: "manager",
+          align: "center",
+        },
+        {
+          title: "审核状态",
+          dataIndex: "status",
+          key: "status",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creater",
+          key: "creater",
+          align: "center",
+        },
+        {
+          title: "审核时间",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+        },
+        {
+          title: "审核说明",
+          dataIndex: "msg",
+          key: "msg",
+          align: "center",
+        },
+
+        {
+          title: "操作",
+          dataIndex: "opt",
+          key: "opt",
+          align: "center",
+          customRender: () => {
+            return (
+              <div>
+                <span>审核日志</span>
+              </div>
+            );
+          },
+        },
+      ],
+      tableData1: [
+        {
+          number: "1",
+          name: "课程1",
+          belong: "管理者进阶/管理者进阶腾飞班",
+          manager: "黄华，刘军",
+          status: "通过",
+          creater: "管理员",
+          time: "-",
+          msg: "-",
+        },
+      ],
+    });
+    const getProjList = (obj) => {
+      let objn = obj || {
+        beginTime: 0,
+        createName: "",
+        endTime: 0,
+        manager: "",
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        status: 0,
+      };
+      listView(objn)
+        .then((res) => {
+          console.log("获取已审核项目成功", res);
+          let result = res.data.data.rows;
+          state.total = res.data.data.total;
+          setTableData(result);
+        })
+        .catch((err) => {
+          console.log("获取已审核项目失败", err);
+        });
+    };
+    const setTableData = (tabledata) => {
+      let data = tabledata;
+      data.map((item) => {
+        let obj = {
+          number: item.projectId,
+          name: getName(item),
+          belong: getBelong(item),
+          manager: item.manager,
+          status: item.status == 2 ? "通过" : "拒绝",
+          creater: item.createName,
+          time: toDate(item.beginTime, "Y-M-D h-m"),
+          msg: item.description,
+        };
+        state.tableData1.push(obj);
+      });
+    };
+    const getName = (item) => {
+      if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        !Object.prototype.hasOwnProperty.call(
+          item.subList[0].subList[0],
+          "name"
+        )
+      ) {
+        // 两层
+        return item.subList[0].name;
+      } else if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
+      ) {
+        //三层
+        return item.subList[0].subList[0].name;
+        // return item.name
+      } else {
+        // 单层
+        return item.name;
+      }
+    };
+    const getBelong = (item) => {
+      if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        !Object.prototype.hasOwnProperty.call(
+          item.subList[0].subList[0],
+          "name"
+        )
+      ) {
+        // 两层
+        return item.name;
+      } else if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
+      ) {
+        //三层
+        return item.subList[0].name + "/" + item.subList[0].subList[0].name;
+        // return item.name
+      } else {
+        // 单层
+        return item.name;
+      }
+    };
+    const changePagination = (pagina) => {
+      state.currentPage = pagina;
+      getProjList();
+    };
+    const search = () => {
+      let obj = {
+        beginTime: dayjs(state.valueDate[0]).format("YYYY-MM-DD"),
+        createName: state.valuecreater,
+        endTime: dayjs(state.valueDate[1]).format("YYYY-MM-DD"),
+        manager: state.valuename,
+        name: state.valueproj,
+        pageNo: state.currentPage,
+        pageSize: 10,
+        status: 0,
+      };
+      getProjList(obj);
+    };
+    const reset = () => {
+      state.valueproj = null;
+      state.valuecreater = null;
+      state.valuename = null;
+      state.valueDate = null;
+      state.valuestate = null;
+      getProjList();
+    };
+    onMounted(() => {
+      getProjList();
+    });
 
     return {
       ...toRefs(state),
+      getProjList,
+      setTableData,
+      getName,
+      getBelong,
+      changePagination,
+      search,
+      reset,
     };
   },
 };
 </script>
 <style lang="scss">
 .projectviewed {
+  width: 100%;
+  .tmpl {
+    width: 100%;
+    .tmpl_header {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      margin-bottom: 32px;
+
+      margin-left: 32px;
+      margin-right: 32px;
+      .tmplh_inp {
+        .inpbox {
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 42px;
+          .inpbox1 {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-right: 24px;
+            margin-top: 10px;
+            .ant-select-selector {
+              border-radius: 8px;
+              width: 270px;
+              height: 40px;
+              padding-top: 5px;
+            }
+            span {
+              white-space: nowrap;
+            }
+          }
+        }
+      }
+      .tmplh_btn {
+        display: flex;
+        // margin-left: 38px;
+        margin-top: 32px;
+        .btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          cursor: pointer;
+          flex-shrink: 0;
+          .search {
+            background-size: 100%;
+          }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+          .btnText1 {
+            color: rgb(255, 255, 255);
+          }
+          .btnText2 {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn1 {
+          background: #409eff;
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+        }
+        .btn2 {
+          background: #ffffff;
+          border: 1px solid #388be1;
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset1.png");
+          }
+        }
+        .btn1:hover {
+          background: rgb(255, 255, 255);
+          border: 1px solid #388be1;
+          .search {
+            background-image: url("../../assets/images/courseManage/search1.png");
+          }
+          .btnText {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn2:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+          .btnText {
+            color: #ffffff;
+          }
+        }
+      }
+    }
+    .tmpl_body {
+      padding: 0px 30px;
+      .tmpl_tabbox {
+        .operation {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #4ea6ff;
+          .nselect {
+            justify-content: center;
+            align-items: center;
+            display: flex;
+            .jc {
+              margin-left: 20px;
+              white-space: nowrap;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+      .pa {
+        width: 100%;
+        margin-top: 20px;
+        display: flex;
+        justify-content: center;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 56931cc2..171c254c 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -6,26 +6,473 @@
  * @FilePath: /fe-manage/src/views/examine/ProjectReviewedN.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
-<!-- 待审核项目页面 -->
+<!-- 待审核项目页面 projectviewedn-->
 <template>
-  <div class="projectviewedn"></div>
+  <div class="projectviewedn">
+    <div class="tmpl">
+      <div class="tmpl_header">
+        <div class="tmplh_inp">
+          <div class="inpbox">
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valueproj"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入项目名称/所属项目"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuename"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入项目经理"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-input
+                v-model:value="valuecreater"
+                style="
+                  width: 270px;
+                  height: 40px;
+                  border-radius: 8px;
+                  margin-right: 14px;
+                "
+                placeholder="请输入创建人"
+              />
+            </div>
+            <div class="inpbox1">
+              <a-range-picker
+                v-model:value="valueDate"
+                style="border-radius: 8px; height: 40px; margin-left: 5px"
+                :placeholder="['      开始时间', '        结束时间']"
+                @change="rankTimeChange"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="tmplh_btn">
+          <div class="btn btn1" @click="search">
+            <div class="search"></div>
+            <div class="btnText btnText1">搜索</div>
+          </div>
+          <div class="btn btn2" @click="reset">
+            <div class="search"></div>
+            <div class="btnText btnText2">重置</div>
+          </div>
+        </div>
+      </div>
+      <div class="tmpl_body">
+        <div class="tmpl_tabbox">
+          <a-table
+            :columns="columns1"
+            :data-source="tableData1"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :pagination="false"
+            :scroll="{ x: 1300 }"
+          />
+        </div>
+        <div class="tableBox">
+          <div class="pa">
+            <a-pagination
+              v-if="total > 10"
+              showSizeChanger="true"
+              show-quick-jumper
+              :pageSize="pageSize"
+              v-model:current="currentPage"
+              :total="total"
+              class="pagination"
+              @change="changePagination"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 审核项目页面 -->
+    <project-audit
+      v-model:ProjAuditvisible="ProjAuditvisible"
+      v-model:projectId="projectId"
+    />
+  </div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
-
+import { onMounted, reactive, toRefs } from "vue";
+import ProjectAudit from "../../components/drawers/ProjectAudit";
+import { projlist } from "../../api/indexAudit";
+import { toDate } from "@/api/method";
+import dayjs from "dayjs";
 export default {
   name: "ProjectViewedN",
-
+  components: { ProjectAudit },
   setup() {
-    const state = reactive({});
+    const state = reactive({
+      optionsproj: [
+        {
+          value: "jack",
+          label: "Jack",
+        },
+        {
+          value: "rose",
+          label: "rose",
+        },
+      ],
+      valueproj: null,
+      valuecreater: null,
+      valuename: null,
+      valueDate: [],
+      ProjAuditvisible: false,
+      currentPage: 1,
+      total: null,
+      pageSize: 10,
+      columns1: [
+        {
+          title: "序号",
+          dataIndex: "number",
+          key: "number",
+          align: "center",
+        },
+        {
+          title: "项目名称",
+          dataIndex: "name",
+          key: "name",
+          align: "center",
+        },
 
+        {
+          title: "所属项目",
+          dataIndex: "belong",
+          key: "belong",
+          align: "center",
+          width: "11%",
+        },
+        {
+          title: "项目经理",
+          dataIndex: "manager",
+          key: "manager",
+          align: "center",
+        },
+        {
+          title: "审核状态",
+          dataIndex: "status",
+          key: "status",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creater",
+          key: "creater",
+          align: "center",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          align: "center",
+        },
+
+        {
+          title: "操作",
+          dataIndex: "opt",
+          key: "opt",
+          align: "center",
+          customRender: () => {
+            return (
+              <div>
+                <span
+                  style="cursor:pointer"
+                  onClick={() => {
+                    showProjAudit();
+                  }}
+                >
+                  审核
+                </span>
+              </div>
+            );
+          },
+        },
+      ],
+      tableData1: [
+        {
+          number: "1",
+          name: "课程1",
+          belong: "管理者进阶/管理者进阶腾飞班",
+          manager: "黄华，刘军",
+          status: "待审核",
+          creater: "管理员",
+          time: "-",
+        },
+      ],
+    });
+    const showProjAudit = () => {
+      state.ProjAuditvisible = true;
+    };
+    const getProjList = (obj) => {
+      let objn = obj || {
+        beginTime: 0,
+        createName: "",
+        endTime: 0,
+        manager: "",
+        name: "",
+        pageNo: state.currentPage,
+        pageSize: 10,
+        status: 1,
+      };
+      projlist(objn)
+        .then((res) => {
+          console.log("获取待审核项目成功", res);
+          let result = res.data.data;
+          state.total = result.total;
+          if (result.total > 0) {
+            setProjList(result.rows);
+          }
+        })
+        .catch((err) => {
+          console.log("获取待审核项目失败", err);
+        });
+    };
+    const setProjList = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((item) => {
+        let obj = {
+          number: item.projectId,
+          name: getName(item),
+          belong: getBelong(item),
+          manager: item.manager,
+          status: "待审核",
+          creater: item.createName,
+          time: toDate(item.createTime, "Y-M-D h-m"),
+        };
+        array.push(obj);
+      });
+      state.tableData1 = [];
+    };
+    const getName = (item) => {
+      if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        !Object.prototype.hasOwnProperty.call(
+          item.subList[0].subList[0],
+          "name"
+        )
+      ) {
+        // 两层
+        return item.subList[0].name;
+      } else if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
+      ) {
+        //三层
+        return item.subList[0].subList[0].name;
+        // return item.name
+      } else {
+        // 单层
+        return item.name;
+      }
+    };
+    const getBelong = (item) => {
+      if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        !Object.prototype.hasOwnProperty.call(
+          item.subList[0].subList[0],
+          "name"
+        )
+      ) {
+        // 两层
+        return item.name;
+      } else if (
+        Object.prototype.hasOwnProperty.call(item.subList[0], "name") &&
+        Object.prototype.hasOwnProperty.call(item.subList[0].subList[0], "name")
+      ) {
+        //三层
+        return item.subList[0].name + "/" + item.subList[0].subList[0].name;
+        // return item.name
+      } else {
+        // 单层
+        return item.name;
+      }
+    };
+    const changePagination = (pagina) => {
+      state.currentPage = pagina;
+      getProjList();
+    };
+    const reset = () => {
+      (state.valueproj = null),
+        (state.valuecreater = null),
+        (state.valuename = null),
+        (state.valueDate = []);
+      getProjList();
+    };
+    const search = () => {
+      let obj = {
+        beginTime: dayjs(state.valueDate[0]).format("YYYY-MM-DD"),
+        createName: state.valuecreater,
+        endTime: dayjs(state.valueDate[1]).format("YYYY-MM-DD"),
+        manager: state.valuename,
+        name: state.valueproj,
+        pageNo: state.currentPage,
+        pageSize: 10,
+        status: 1,
+      };
+      getProjList(obj);
+    };
+    onMounted(() => {
+      getProjList();
+    });
     return {
       ...toRefs(state),
+      showProjAudit,
+      getProjList,
+      setProjList,
+      getName,
+      getBelong,
+      changePagination,
+      reset,
+      search,
     };
   },
 };
 </script>
 <style lang="scss">
 .projectviewedn {
+  width: 100%;
+  .tmpl {
+    width: 100%;
+    .tmpl_header {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      margin-bottom: 32px;
+
+      margin-left: 32px;
+      margin-right: 32px;
+      .tmplh_inp {
+        .inpbox {
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 42px;
+          .inpbox1 {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-right: 24px;
+            margin-top: 10px;
+            .ant-select-selector {
+              border-radius: 8px;
+              width: 270px;
+              height: 40px;
+              padding-top: 5px;
+            }
+            span {
+              white-space: nowrap;
+            }
+          }
+        }
+      }
+      .tmplh_btn {
+        display: flex;
+        // margin-left: 38px;
+        margin-top: 32px;
+        .btn {
+          padding: 0px 26px 0px 26px;
+          height: 38px;
+          border-radius: 8px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-right: 14px;
+          cursor: pointer;
+          flex-shrink: 0;
+          .search {
+            background-size: 100%;
+          }
+          .btnText {
+            font-size: 14px;
+            font-weight: 400;
+            line-height: 36px;
+            margin-left: 5px;
+          }
+          .btnText1 {
+            color: rgb(255, 255, 255);
+          }
+          .btnText2 {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn1 {
+          background: #409eff;
+          .search {
+            width: 15px;
+            height: 17px;
+            background-image: url("../../assets/images/courseManage/search0.png");
+          }
+        }
+        .btn2 {
+          background: #ffffff;
+          border: 1px solid #388be1;
+          .search {
+            width: 16px;
+            height: 18px;
+            background-image: url("../../assets/images/courseManage/reset1.png");
+          }
+        }
+        .btn1:hover {
+          background: rgb(255, 255, 255);
+          border: 1px solid #388be1;
+          .search {
+            background-image: url("../../assets/images/courseManage/search1.png");
+          }
+          .btnText {
+            color: rgba(64, 158, 255, 1);
+          }
+        }
+        .btn2:hover {
+          background: rgba(64, 158, 255, 1);
+          .search {
+            background-image: url("../../assets/images/courseManage/reset0.png");
+          }
+          .btnText {
+            color: #ffffff;
+          }
+        }
+      }
+    }
+    .tmpl_body {
+      padding: 0px 30px;
+      .tmpl_tabbox {
+        .operation {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #4ea6ff;
+          .nselect {
+            justify-content: center;
+            align-items: center;
+            display: flex;
+            .jc {
+              margin-left: 20px;
+              white-space: nowrap;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+      .pa {
+        width: 100%;
+        margin-top: 20px;
+        display: flex;
+        justify-content: center;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 10cc4022..d14ac5f7 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1025,7 +1025,7 @@
                       <a-upload
                         v-model:file-list="fileList"
                         name="file"
-                        action="/api/file/upload"
+                        action="/manageApi/file/upload"
                         @change="handleChange"
                       >
                         <span
@@ -1062,7 +1062,11 @@
                         <span style="font: oblique bold 16px Sans-serif">{{
                           item.name
                         }}</span>
-                        <span style="color: #4ea6ff; float: right;cursor: pointer;" @click="deFile(item.uid)">删除</span>
+                        <span
+                          style="color: #4ea6ff; float: right; cursor: pointer"
+                          @click="deFile(item.uid)"
+                          >删除</span
+                        >
                       </div>
                     </div>
                   </div>
@@ -3260,7 +3264,7 @@ export default {
           let luj = info.attach;
           console.log("lulj", luj);
           console.log("赚回来", JSON.parse(luj));
-          state.fileList = JSON.parse(luj)
+          state.fileList = JSON.parse(luj);
           // state.fileList = luj
         }
       });
@@ -3369,33 +3373,23 @@ export default {
     };
     //end---------项目概览
 
-    const handleChange = (info) => {
+    const handleChange = ({ file, fileList }) => {
       let list = [];
-      if (info.file.status !== "uploading") {
-        console.log(info.file.response.data, info.fileList);
-        // info.fileList.map((item) => {
-        //   //把地址放到list里
-        //   // list.push(item.response.data);
-        //   // list.push(JSON.stringify(item))
-        //     state.fileList.push(item)
-        // });
-        
-        state.fileList.push(info.file)
-        list = state.fileList
+      if (file.status !== "uploading") {
+        console.log("上传的list", fileList);
+        console.log(file);
+        list = state.fileList;
         console.log("list", list);
-        // let str = list.join(",");
         let str = JSON.stringify(list);
-        console.log("str", str);
+        console.log("str",str)
         //要编辑项目
         editProj({
           attach: str,
           beginTime: state.tstartTime.slice(0, 10),
-          // beginTime:1668643200,
           boeFlag: state.boeFlag,
           category: state.category,
           courseSyncFlag: state.courseSyncFlag,
           endTime: state.tendTime.slice(0, 10),
-          // endTime: 1668816000,
           level: state.tlevel,
           manager: state.manager,
           managerId: state.managerId,
@@ -3420,10 +3414,10 @@ export default {
           });
       }
 
-      if (info.file.status === "done") {
-        message.success(`${info.file.name} 文件上传成功`);
-      } else if (info.file.status === "error") {
-        message.error(`${info.file.name} 文件上传失败.`);
+      if (file.status === "done") {
+        message.success(`${file.name} 文件上传成功`);
+      } else if (file.status === "error") {
+        message.error(`${file.name} 文件上传失败.`);
       }
     };
 
@@ -3608,45 +3602,47 @@ export default {
         });
     };
     //删除文件
-    const deFile=(id)=>{
-      console.log(id)
-      let index = state.fileList.findIndex(item=>{item.uid==id})
-      state.fileList.splice(index,1)
-      let str = JSON.stringify(state.fileList)
+    const deFile = (id) => {
+      console.log(id);
+      let index = state.fileList.findIndex((item) => {
+        item.uid == id;
+      });
+      state.fileList.splice(index, 1);
+      let str = JSON.stringify(state.fileList);
       editProj({
-          attach: str,
-          beginTime: state.tstartTime.slice(0, 10),
-          // beginTime:1668643200,
-          boeFlag: state.boeFlag,
-          category: state.category,
-          courseSyncFlag: state.courseSyncFlag,
-          endTime: state.tendTime.slice(0, 10),
-          // endTime: 1668816000,
-          level: state.tlevel,
-          manager: state.manager,
-          managerId: state.managerId,
-          name: state.name,
-          notice: state.notice,
-          noticeFlag: state.noticeFlag,
-          parentId: state.parentId,
-          picUrl: state.picUrl,
-          projectId: state.projectId,
-          remark: state.remark,
-          sourceBelongId: Number(state.tsourceBelong),
-          status: state.status,
-          systemId: state.tsystemId,
-          templateId: state.templateId || 0,
-          type: state.type,
+        attach: str,
+        beginTime: state.tstartTime.slice(0, 10),
+        // beginTime:1668643200,
+        boeFlag: state.boeFlag,
+        category: state.category,
+        courseSyncFlag: state.courseSyncFlag,
+        endTime: state.tendTime.slice(0, 10),
+        // endTime: 1668816000,
+        level: state.tlevel,
+        manager: state.manager,
+        managerId: state.managerId,
+        name: state.name,
+        notice: state.notice,
+        noticeFlag: state.noticeFlag,
+        parentId: state.parentId,
+        picUrl: state.picUrl,
+        projectId: state.projectId,
+        remark: state.remark,
+        sourceBelongId: Number(state.tsourceBelong),
+        status: state.status,
+        systemId: state.tsystemId,
+        templateId: state.templateId || 0,
+        type: state.type,
+      })
+        .then((res) => {
+          console.log("上传成功", res);
+          message.destroy();
+          return message.success("删除成功");
         })
-          .then((res) => {
-            console.log("上传成功", res);
-            message.destroy()
-            return message.success("删除成功")
-          })
-          .catch((err) => {
-            console.log("上传失败了", err);
-          });
-    }
+        .catch((err) => {
+          console.log("上传失败了", err);
+        });
+    };
     onMounted(() => {
       getStu();
       getTaskList();

From 6ecc8e01fdf6c5f34f6316e503e1cf016953181c Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 22 Nov 2022 18:25:24 +0800
Subject: [PATCH 87/90] =?UTF-8?q?fit:=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=20=E9=80=89=E6=8B=A9=E6=B5=8B=E8=AF=84=E3=80=81=E8=AF=95?=
 =?UTF-8?q?=E5=8D=B7=20=E3=80=81=E5=9B=9B=E4=B8=AA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9D=A1=E4=BB=B6=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=9C=80=E5=A4=9A=E9=80=89=E6=8B=A9=E4=B8=A4?=
 =?UTF-8?q?=E6=9D=A1=20=E9=80=89=E6=8B=A9=E8=AF=95=E5=8D=B7=E3=80=81?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=84=E6=9C=80=E5=A4=9A=E9=80=89=E6=8B=A9=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E5=8F=AF=E5=8F=8D=E9=80=89=E5=88=9B=E5=BB=BA=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=84=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddCase.vue    | 24 ++++++++----------
 src/components/drawers/AddEval.vue    |  4 +++
 src/components/drawers/AddTest.vue    | 33 ++++++++++++++----------
 src/components/drawers/EvList.vue     | 36 +++++++++++++++++++--------
 src/components/drawers/FaceManage.vue | 28 +++++++++++++--------
 src/components/drawers/SelectTest.vue | 24 ++++++++++++++----
 src/components/drawers/TestManage.vue |  5 +++-
 src/components/drawers/TimeManage.vue |  4 ++-
 src/components/drawers/WorkManage.vue |  6 +++--
 9 files changed, 108 insertions(+), 56 deletions(-)

diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 293ac1e7..22c806dc 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -150,8 +150,10 @@ export default {
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
-    const afterVisibleChange = () => {
-      getAllCaseText()
+    const afterVisibleChange = (bol) => {
+      if ( bol == true ) {
+        getAllCaseText()
+      }
     };
     const tableDataFunc = () => {
       const columns = [
@@ -182,6 +184,9 @@ export default {
       return columns;
     };
     const onSelectChange = (selectedRowKeys,selectedRows)=> {
+      if(selectedRowKeys.length>2){
+        return
+      }
       state.selectedRowKeys = selectedRowKeys;
       state.apiTaskList = selectedRows;
     };
@@ -251,18 +256,6 @@ export default {
           });
       } else if (props.isLevel == 2) {
         if(state.apiTaskList.length > 1){
-          // for((item,index) in state.apiTaskList){
-          //   apiTask
-          //   .addTask({
-          //     "courseId": item.caseId,
-          //     "duration": 0,
-          //     "flag": true,
-          //     "name": item.caseName,
-          //     "projectId": props.projectId,
-          //     "projectTaskId": props.projectTaskId,
-          //     "stageId": props.chooseStageId,
-          //     "type": 3,
-          //   })
           for(let i = 0;i <= state.apiTaskList.length;i++){
             apiTask
             .addTask({
@@ -455,6 +448,9 @@ export default {
         .ant-table-selection-column {
           padding: 0px !important;
           padding-left: 15px !important;
+          .ant-table-selection{
+            display: none;
+          }
         }
         .ant-table-thead > tr > th {
           background-color: rgba(239, 244, 252, 1);
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 0a58aef2..2f3ece39 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -215,6 +215,8 @@ export default {
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
             stageId: props.chooseStageId,
+            evaluationTypeId: state.evaluationTypeId,
+            evaluationTypeName: state.evaluationTypeName,
             type: 10,
           })
           .then(( ) => {
@@ -230,6 +232,8 @@ export default {
           name: res.data.data.evaluationName,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
+          evaluationTypeId: state.evaluationTypeId,
+          evaluationTypeName: state.evaluationTypeName,
           type: 10,
         })
           .then(( ) => {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 82c24cf7..e16ef4d4 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -78,15 +78,16 @@
             <div class="main_item">
               <div class="btnbox">
                 <a-form-item has-feedback label="选择试卷" name="choosedTest">
-                  <!-- <a-select
-                dropdownClassName="dropdown-style"
-                placeholder="请输入考试名称"
-                :options="options1"
-                v-model:value="formState.choosedTest"
-                allowClear
-                showSearch
-              /> -->
-                  <a-dropdown>
+                  <a-button
+                      type="primary"
+                      style="width: 100px; margin-left: 35px"
+                      class="outer"
+                      @click.prevent
+                      @click="selectTest()"
+                    >
+                      选择试卷
+                    </a-button>
+                  <!-- <a-dropdown>
                     <a-button
                       type="primary"
                       style="width: 100px; margin-left: 35px"
@@ -109,16 +110,22 @@
                         </a-menu-item>
                       </a-menu>
                     </template>
-                  </a-dropdown>
+                  </a-dropdown> -->
                   <span style="margin-left: 10px">
                     <a-tag
+                      class="tag-style"
+                      v-if="paperName != ''"
+                      :closable="true"
+                      >{{ paperName }}</a-tag
+                    >
+                    <!-- <a-tag
                       class="tag-style"
                       v-for="item in choosedTestList"
                       :closable="true"
                       @close="closeTag(item.key)"
                       :key="item.key"
                       >{{ item.value }}</a-tag
-                    >
+                    > -->
                   </span>
                 </a-form-item>
               </div>
@@ -709,8 +716,8 @@ export default {
           .catch(() => {
             message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
           });
-      } else if (props.isLevel == 3) {
-        console.log("");
+        } else if (props.isLevel == 3) {
+          console.log("");
       }
     };
 
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 5bb04782..257dbd95 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -36,7 +36,7 @@
                 <div class="search"></div>
                 <div class="btnText">搜索</div>
               </div>
-              <div class="btn btn2">
+              <div class="btn btn2" @click="resetData">
                 <div class="search"></div>
                 <div class="btnText">重置</div>
               </div>
@@ -50,7 +50,7 @@
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
             :pagination="false"
-            :row-selection="{ selectedRowKeys:selectedRowKeys,onSelect:onSelect,onChange:onSelectChange}"
+            :row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}"
           />
           <div class="pa">
             <a-pagination
@@ -148,18 +148,25 @@
           },
         ]
       });
-    const onSelect = (record)=> {
-      state.evaluationTypeName = record.title
-      state.evaluationTypeId = record.quiz_code
-    };
-    const onSelectChange = (selectedRowKeys)=> {
+    // const onSelect = (record)=> {
+    //   state.evaluationTypeName = record.title
+    //   state.evaluationTypeId = record.quiz_code
+    // };
+    const onSelectChange = (selectedRowKeys,selectedRows)=> {      
+      if(state.selectedRowKeys.length>1){
+        return
+      }
       state.selectedRowKeys = selectedRowKeys
+      state.evaluationTypeName = selectedRows[0].record.title
+      state.evaluationTypeId = selectedRows[0].quiz_code
     }
     const closeDrawer = () => {
       ctx.emit("update:EvalListVisible", false);
     };
-    const afterVisibleChange = () => {
-      getAllEvalText();
+    const afterVisibleChange = (bol) => {
+      if ( bol == true ) {
+        getAllEvalText();
+      }
     };
     const checkFinish =() =>{
       let EvListDate = {
@@ -204,15 +211,24 @@
       .catch(()=>{
       })
     }
+    //重置测评列表
+    const resetData = ()=> {
+      state.currentPage = 1;
+      state.tableData = [];
+      state.selectedRowKeys = [];
+      state.evaluationTypeId = null;
+      state.evaluationTypeName = "";
+      getAllEvalText();
+    }
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelect,
       getTableDataList,
       checkFinish,
       changePagination,
+      resetData,
     };
     },
   };
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index c87e5671..c9040848 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -98,7 +98,6 @@
             :row-selection="{
               selectedRowKeys: selectedRowKeys,
               onChange: onSelectChange,
-              onSelect: onSelect,
             }"
           />
           <div class="pa">
@@ -194,12 +193,20 @@ export default {
       selectedRowKeys: [],
       tabledata: [
         {
+          key:1,
           workNum:1,
           status:"已完成",
           operation:"",
         },
         {
-          workNum:1,
+          key:2,
+          workNum:2,
+          status:"未完成",
+          operation:"",
+        },
+        {
+          key:3,
+          workNum:2,
           status:"未完成",
           operation:"",
         }
@@ -341,18 +348,21 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:Fvisible", false);
     };
-    const afterVisibleChange = () => {
-      getManageList()
+    const afterVisibleChange = (bol) => {
+      if ( bol == true ) {
+        getManageList()
+      }
+      
     };
     const selectProjectName = (value) => {
       state.projectName = value;
     };
     const onSelectChange = (selectedRowKeys) => {
-      state.selectedRowKeys = selectedRowKeys;
+        if(selectedRowKeys.length > 2){
+          return
+        }
+        state.selectedRowKeys = selectedRowKeys;
     };
-    const onSelect = (record) => {
-      console.log(record);
-    }
 
     const allStuOver = ()=> {
       state.ASOvervisible = true
@@ -457,7 +467,6 @@ export default {
       closeDrawer,
       afterVisibleChange,
       onSelectChange,
-      onSelect,
       allStuOver,
       showEntryScore,
       godie,
@@ -672,7 +681,6 @@ export default {
       .tableBox {
         .ant-table-selection-column {
           padding: 0px !important;
-          // padding-left: 45px !important;
         }
         .ant-pagination-item,
         .ant-pagination-prev,
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index 74cdee07..5141cb5b 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -126,8 +126,10 @@
         ctx.emit("update:STvisible", false);
       };
 
-      const afterVisibleChange = () => {
+      const afterVisibleChange = (bol) => {
+        if (bol == true) {
           getManageList()
+        }
       };
 
       const tableDataFunc = ()=> {
@@ -186,6 +188,9 @@
         state.SelectTestData = record
       };
       const onSelectChange = (selectedRowKeys) => {
+        if(selectedRowKeys.length>1){
+          return
+        }
         state.selectedRowKeys = selectedRowKeys;
       }
 
@@ -232,7 +237,7 @@
           });
       };
   
-      //搜索任务列表
+      //搜索任务列表 没接口
       const searchTaskList = () => {
         let objser = {
           name: "",
@@ -264,9 +269,12 @@
   
       //重置任务列表
       const resetTaskList = () => {
-        state.name = "";
-        state.projectName = "";
-        state.tabledata = [];
+        state.inputPname = "";
+        state.inputCname = "";
+        state.tableData = [];
+        state.selectedRowKeys = [];
+        state.SelectTestData = [];
+        state.currentPage = 1;
         getManageList();
       };
       return {
@@ -398,6 +406,12 @@
           }
         }
         .tab {
+
+          .ant-table-selection-column {
+            .ant-table-selection{
+              display: none;
+            }
+          }
           th.h {
             background-color: #eff4fc !important;
           }
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 6d753120..54cf82fd 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -394,8 +394,11 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:TMvisible", false);
     };
-    const afterVisibleChange = () => {
+    const afterVisibleChange = (bol) => {
+      if ( bol == true ) {
         getManageList();
+      }
+        
     };
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index 4dfb6a1c..c4a18e21 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -345,8 +345,10 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:Tvisible", false);
     };
-    const afterVisibleChange = () => {
+    const afterVisibleChange = (bol) => {
+      if ( bol == true ) {
         getManageList();
+      }
     };
     const selectProjectName = (value) => {
       state.projectName = value;
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index cf404496..8916b350 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -299,8 +299,10 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:Wvisible", false);
     };
-    const afterVisibleChange = () => {
-      getManageList();
+    const afterVisibleChange = (bol) => {
+      if ( bol == true ) {
+        getManageList();
+      }
     };
     const selectProjectName = (value) => {
       state.projectName = value;

From 66fc7c8c13448850491c877973567e89e591fdfa Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 22 Nov 2022 20:43:02 +0800
Subject: [PATCH 88/90] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                         |   3 +-
 src/api/index1.js                         |   6 +-
 src/components/NavLeft.vue                |  10 +-
 src/components/drawers/OwnPower.vue       | 148 +++------
 src/components/drawers/Ownership.vue      | 185 +++++------
 src/components/drawers/ProjectOwn.vue     | 247 ++++++++------
 src/views/courselibrary/CourseManage.vue  |  23 +-
 src/views/projectcenter/ProjectAdd.vue    | 374 ++++++++++++----------
 src/views/projectcenter/ProjectManage.vue |  71 +++-
 src/views/projectcenter/TaskPage.vue      |  73 +++--
 10 files changed, 600 insertions(+), 540 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index f545226a..e51593fd 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 15:13:50
+ * @LastEditTime: 2022-11-22 20:17:22
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -29,6 +29,7 @@ http.interceptors.request.use(
       config.headers.token = 123456; //测试1111
     } else {
       console.log("当前请求页面无token,请执行操作！！！");
+
       // 此处测试默认配置token
       config.headers.token = "123456";
       // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njg4NjI2MTAsImV4cCI6MTY2ODg2OTgxMCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.defa91ecb2b61d9b20d858db0c2c8d7d80dea4613cb2559a22569b7df36b3f6b";
diff --git a/src/api/index1.js b/src/api/index1.js
index 6e5402e5..bc2d71bd 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 16:39:08
+ * @LastEditTime: 2022-11-22 18:04:47
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -87,6 +87,10 @@ export const billboard = (obj) => http.post('/admin/project/billboard', obj);
 
 //获取字典信息
 export const getDict = (obj) => http.post('/dict/getList', obj)
+//获取组织树
+export const getOrgTree = (obj) => http.post('/admin/router/orgList', obj)
+
+
 // 获取组织结构树
 export const orgtree = () => http.get('/org/tree');
 
diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index ce679c18..41e7257d 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -192,8 +192,8 @@
               src="../assets/images/navleft/certificate.png"
             />
           </div>
-
-          <router-link to="/certificatecenter">证书中心</router-link>
+          <span>证书中心</span>
+          <!-- <router-link to="/certificatecenter">证书中心</router-link> -->
         </a-menu-item>
         <a-menu-item key="sub9" @titleClick="titleClick">
           <div class="imgBox">
@@ -202,7 +202,8 @@
               src="../assets/images/navleft/system.png"
             />
           </div>
-          <router-link to="/systemmanage">系统管理</router-link>
+          <span>系统管理</span>
+          <!-- <router-link to="/systemmanage">系统管理</router-link> -->
         </a-menu-item>
       </a-menu>
     </div>
@@ -219,6 +220,9 @@
         mode="inline"
         @click="handleClick"
       >
+        <a-menu-item key="sub10" @titleClick="titleClick">
+          <router-link to="/coursereviewedn">审核</router-link>
+        </a-menu-item>
         <a-menu-item key="sub1" @titleClick="titleClick">
           <router-link to="/learningpath">学习</router-link>
         </a-menu-item>
diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue
index 5ca07e8a..a91eace8 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -6,7 +6,7 @@
     width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain" id="ownpower">
+    <div class="drawerMain" id="ProjOwnership">
       <div class="header">
         <div class="headerTitle">归属权</div>
         <img
@@ -101,6 +101,7 @@
                           columnWidth: 20,
                           selectedRowKeys: selectedRowKeys,
                           onChange: onSelectChange,
+                          type: 'radio',
                         }"
                       />
                       <div class="pa">
@@ -121,80 +122,30 @@
                   </div>
                 </div>
               </a-tab-pane>
-            
             </a-tabs>
           </div>
         </div>
         <div class="right">
           <div class="onerow">
             <div class="onleft">
-              <div class="already">已选</div>
-              <!-- <div class="count">6</div>
-              <div class="peo">人</div> -->
-            </div>
-            <div class="clbox" @click="deleteAll">
-              <div class="colose"></div>
-              <span class="allclear">全部清除</span>
-            </div>
-          </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
+                style="
+                  display: flex;
+                  align-items: center;
+                  margin-bottom: 20px;
+                  flex-wrap: wrap;
+                "
+              >
+                <div class="already">当前归属：</div>
                 <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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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 class="clbox">
+              <span class="allclear">转移归属权</span>
             </div>
           </div>
-          
         </div>
       </div>
       <div class="btnn">
@@ -202,8 +153,6 @@
         <button class="btn2">确定</button>
       </div>
     </div>
-
- 
   </a-drawer>
 </template>
 
@@ -567,7 +516,6 @@ export default {
         },
       ],
 
-     
       //快速选人-------------------------------------
       valueSelectboe: null, //快速选人的选择组织
       choosepeople: [], //总的数组
@@ -576,14 +524,12 @@ export default {
       showHidden: false, //是否显示收回
       selectedRowKeys: [], //表格选中的key
       //快速选人-------------------------------------
-     
     });
     const closeDrawer = () => {
       state.activeKey = "1";
       ctx.emit("update:ownpowervisible", false);
     };
 
-
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
@@ -690,8 +636,6 @@ export default {
 
     // 结束 快速选人------------------------------------------------------------------
 
-  
-
     //全部清除
     const deleteAll = () => {
       //快速选人-------------------------------------
@@ -701,10 +645,9 @@ export default {
       state.showHidden = false; //是否显示收回
       state.selectedRowKeys = []; //表格选中的key
       //快速选人-------------------------------------
-     
     };
     return {
-     ...toRefs(state),
+      ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
@@ -715,10 +658,7 @@ export default {
       morePeopleShow,
       morePeopleHidden,
 
-    
-
       deleteAll,
-
     };
   },
 };
@@ -726,7 +666,7 @@ export default {
 
 <style lang="scss">
 .ownpower {
- .ant-drawer-content-wrapper {
+  .ant-drawer-content-wrapper {
     max-width: 1300px !important;
   }
   .drawerMain {
@@ -1166,7 +1106,7 @@ export default {
         }
       }
       .right {
-        width: 320px;
+        width: 340px;
         flex-shrink: 0;
         overflow-y: auto;
         .onerow {
@@ -1178,11 +1118,15 @@ export default {
           .onleft {
             display: flex;
             text-align: center;
+            justify-content: space-between;
+            align-items: center;
+            flex-wrap: wrap;
+            margin-left: 32px;
             .already {
               color: rgba(51, 51, 51, 1);
               font-size: 16px;
               font-weight: 500;
-              margin-left: 32px;
+
               white-space: nowrap;
               // margin-bottom: 20px;
             }
@@ -1196,9 +1140,35 @@ export default {
               font-size: 16px;
               font-weight: 500;
             }
+            .chose {
+              // width: 64px;
+              padding-left: 10px;
+              padding-right: 10px;
+              height: 24px;
+              // margin-top: 25px;
+              // margin-right: 25px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 2px;
+              border: 1px solid rgba(56, 139, 225, 1);
+              color: rgba(56, 139, 225, 1);
+              font-size: 12px;
+              position: relative;
+              flex-shrink: 0;
+              .ch {
+                position: absolute;
+                width: 18px;
+                height: 18px;
+                background-image: url(../../assets/images/basicinfo/ch.png);
+                right: -8px;
+                top: -8px;
+              }
+            }
           }
           .clbox {
             margin-left: 30px;
+            margin-bottom: 20px;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -1250,30 +1220,6 @@ export default {
           margin-left: 32px;
           min-height: 100px;
           // overflow: hidden;
-          .chose {
-            // width: 64px;
-            padding-left: 10px;
-            padding-right: 10px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .ch {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-          }
         }
       }
     }
diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue
index 4d70cd0e..1575ad44 100644
--- a/src/components/drawers/Ownership.vue
+++ b/src/components/drawers/Ownership.vue
@@ -7,7 +7,7 @@
     width="85%"
     @after-visible-change="afterVisibleChange"
   >
-    <div class="drawerMain" id="Ownership">
+    <div class="drawerMain" id="ProjOwnership">
       <div class="header">
         <div class="headerTitle">归属权</div>
         <img
@@ -102,6 +102,7 @@
                           columnWidth: 20,
                           selectedRowKeys: selectedRowKeys,
                           onChange: onSelectChange,
+                          type: 'radio',
                         }"
                       />
                       <div class="pa">
@@ -128,70 +129,22 @@
         <div class="right">
           <div class="onerow">
             <div class="onleft">
-              <div class="already">已选</div>
-              <!-- <div class="count">6</div>
-              <div class="peo">人</div> -->
-            </div>
-            <div class="clbox" @click="deleteAll">
-              <div class="colose"></div>
-              <span class="allclear">全部清除</span>
-            </div>
-          </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
+                style="
+                  display: flex;
+                  align-items: center;
+                  margin-bottom: 20px;
+                  flex-wrap: wrap;
+                "
+              >
+                <div class="already">当前归属：</div>
                 <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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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 class="clbox">
+              <span class="allclear">转移归属权</span>
             </div>
           </div>
         </div>
@@ -201,7 +154,6 @@
         <button class="btn2">确定</button>
       </div>
     </div>
-
     <!-- 确认添加部门弹窗 -->
     <a-modal
       v-model:visible="showOrgModal"
@@ -272,7 +224,7 @@ export default {
       nameaddd: "",
       com: "",
       //组织树
-      
+
       treeData: [
         {
           title: "京东方",
@@ -665,31 +617,50 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     const selectedsHeight = () => {
       let resize = elementResizeDetectorMaker();
-      resize.listenTo(document.getElementById('Ownership').querySelector("#selecteds"), function (ele) {
-        console.log("ele", ele.offsetHeight);
-        if (ele.offsetHeight > 160 && !state.showHidden) {
-          state.showMore = true;
-         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
-          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
-        } else if (ele.offsetHeight < 160) {
-          state.showMore = false;
-          state.showHidden = false;
-         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
-          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+      resize.listenTo(
+        document.getElementById("Ownership").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("Ownership")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("Ownership")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("Ownership")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("Ownership")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
         }
-      });
+      );
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "";
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "";
+      document
+        .getElementById("Ownership")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("Ownership")
+        .querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
-     document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+      document
+        .getElementById("Ownership")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("Ownership")
+        .querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------
@@ -1166,7 +1137,7 @@ export default {
         }
       }
       .right {
-        width: 320px;
+        width: 340px;
         flex-shrink: 0;
         overflow-y: auto;
         .onerow {
@@ -1178,11 +1149,15 @@ export default {
           .onleft {
             display: flex;
             text-align: center;
+            justify-content: space-between;
+            align-items: center;
+            flex-wrap: wrap;
+            margin-left: 32px;
             .already {
               color: rgba(51, 51, 51, 1);
               font-size: 16px;
               font-weight: 500;
-              margin-left: 32px;
+
               white-space: nowrap;
               // margin-bottom: 20px;
             }
@@ -1196,9 +1171,35 @@ export default {
               font-size: 16px;
               font-weight: 500;
             }
+            .chose {
+              // width: 64px;
+              padding-left: 10px;
+              padding-right: 10px;
+              height: 24px;
+              // margin-top: 25px;
+              // margin-right: 25px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 2px;
+              border: 1px solid rgba(56, 139, 225, 1);
+              color: rgba(56, 139, 225, 1);
+              font-size: 12px;
+              position: relative;
+              flex-shrink: 0;
+              .ch {
+                position: absolute;
+                width: 18px;
+                height: 18px;
+                background-image: url(../../assets/images/basicinfo/ch.png);
+                right: -8px;
+                top: -8px;
+              }
+            }
           }
           .clbox {
             margin-left: 30px;
+            margin-bottom: 20px;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -1250,30 +1251,6 @@ export default {
           margin-left: 32px;
           min-height: 100px;
           // overflow: hidden;
-          .chose {
-            // width: 64px;
-            padding-left: 10px;
-            padding-right: 10px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .ch {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-          }
         }
       }
     }
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 3be12ad0..ebd7c559 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -74,16 +74,16 @@
                         class="treeMain"
                         :style="{ height: screenHeight - 400 + 'px' }"
                         dropdownClassName="changetreedropdownboe"
-                        defaultExpandAll
+                        default-expand-all
                         :dropdown-style="{
                           maxHeight: '600px',
                         }"
                         placeholder="BOE组织树"
                         allow-clear
-                        tree-default-expand-all
                         :tree-data="treeData"
                         @select="departmentSelect"
                         v-model:selectedKeys="selectedKeys"
+                        v-model:expandedKeys="openKeys"
                       >
                         <template #suffixIcon></template>
                       </a-tree>
@@ -101,6 +101,7 @@
                           columnWidth: 20,
                           selectedRowKeys: selectedRowKeys,
                           onChange: onSelectChange,
+                          type: 'radio',
                         }"
                       />
                       <div class="pa">
@@ -127,70 +128,22 @@
         <div class="right">
           <div class="onerow">
             <div class="onleft">
-              <div class="already">已选</div>
-              <!-- <div class="count">6</div>
-              <div class="peo">人</div> -->
-            </div>
-            <div class="clbox" @click="deleteAll">
-              <div class="colose"></div>
-              <span class="allclear">全部清除</span>
-            </div>
-          </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
+                style="
+                  display: flex;
+                  align-items: center;
+                  margin-bottom: 20px;
+                  flex-wrap: wrap;
+                "
+              >
+                <div class="already">当前归属：</div>
                 <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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                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 class="clbox">
+              <span class="allclear">转移归属权</span>
             </div>
           </div>
         </div>
@@ -238,6 +191,7 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 // import { message } from "ant-design-vue";
+import * as api from "../../api/index1";
 export default {
   name: "ProjOwnerShip",
   props: {
@@ -271,120 +225,148 @@ export default {
       nameadd: "",
       nameaddd: "",
       com: "",
+      openKeys: [2, 13, 32],
       //组织树
       treeData: [
         {
+          key: 1,
           title: "京东方",
           value: "京东方",
           children: [
             {
+              key: 2,
               title: "产研部",
               value: "产研部",
               children: [
                 {
+                  key: 3,
                   title: "产品部",
                   value: "产品部",
                 },
                 {
+                  key: 4,
                   title: "研究部",
                   value: "研究部",
                 },
                 {
+                  key: 5,
                   title: "研究部2",
                   value: "研究部2",
                 },
                 {
+                  key: 6,
                   title: "研究3",
                   value: "研究3",
                 },
                 {
+                  key: 7,
                   title: "研究4",
                   value: "研究4",
                 },
                 {
+                  key: 8,
                   title: "研究部5",
                   value: "研究部5",
                 },
                 {
+                  key: 9,
                   title: "研究部6",
                   value: "研究部6",
                 },
                 {
+                  key: 10,
                   title: "研究部7",
                   value: "研究部7",
                 },
                 {
+                  key: 11,
                   title: "研究部8",
                   value: "研究部8",
                 },
                 {
+                  key: 12,
                   title: "研究部9",
                   value: "研究部9",
                 },
               ],
             },
             {
+              key: 13,
               title: "二级标题",
               value: "二级标题",
               children: [
                 {
+                  key: 14,
                   title: "三级标题",
                   value: "三级标题",
                   children: [
                     {
+                      key: 15,
                       title: "四级标题",
                       value: "四级标题",
                       children: [
                         {
+                          key: 16,
                           title: "五级标题",
                           value: "五级标题",
                           children: [
                             {
+                              key: 17,
                               title: "六级标题",
                               value: "六级标题",
                               children: [
                                 {
+                                  key: 18,
                                   title: "七级标题",
                                   value: "七级标题",
                                   children: [
                                     {
+                                      key: 19,
                                       title: "八级标题",
                                       value: "八级标题",
                                       children: [
                                         {
+                                          key: 20,
                                           title: "九级标题",
                                           value: "九级标题",
                                           children: [
                                             {
+                                              key: 21,
                                               title: "十级标题",
                                               value: "十级标题",
                                               children: [
                                                 {
+                                                  key: 22,
                                                   title: "十一级标题",
                                                   value: "十一级标题",
                                                   children: [
                                                     {
+                                                      key: 23,
                                                       title: "十二级标题",
                                                       value: "十二级标题",
                                                       children: [
                                                         {
+                                                          key: 24,
                                                           title:
                                                             "十三级标题十三级标题十三级标题十三级标题",
                                                           value: "十三级标题",
                                                           children: [
                                                             {
+                                                              key: 25,
                                                               title:
                                                                 "十四级标题",
                                                               value:
                                                                 "十四级标题",
                                                               children: [
                                                                 {
+                                                                  key: 26,
                                                                   title:
                                                                     "十五级标题",
                                                                   value:
                                                                     "十五级标题",
                                                                   children: [
                                                                     {
+                                                                      key: 27,
                                                                       title:
                                                                         "十六级标题",
                                                                       value:
@@ -392,6 +374,7 @@ export default {
                                                                       children:
                                                                         [
                                                                           {
+                                                                            key: 28,
                                                                             title:
                                                                               "十七级标题",
                                                                             value:
@@ -399,6 +382,7 @@ export default {
                                                                             children:
                                                                               [
                                                                                 {
+                                                                                  key: 29,
                                                                                   title:
                                                                                     "十八级标题",
                                                                                   value:
@@ -406,6 +390,7 @@ export default {
                                                                                   children:
                                                                                     [
                                                                                       {
+                                                                                        key: 30,
                                                                                         title:
                                                                                           "十九级标题",
                                                                                         value:
@@ -413,6 +398,7 @@ export default {
                                                                                         children:
                                                                                           [
                                                                                             {
+                                                                                              key: 31,
                                                                                               title:
                                                                                                 "二十级标题二十级标题",
                                                                                               value:
@@ -455,14 +441,17 @@ export default {
               ],
             },
             {
+              key: 32,
               title: "人力资源部",
               value: "人力资源部",
               children: [
                 {
+                  key: 33,
                   title: "人事部",
                   value: "人事部",
                 },
                 {
+                  key: 34,
                   title: "行政部",
                   value: "行政部",
                 },
@@ -602,6 +591,26 @@ export default {
       selectedRowKeys: [], //表格选中的key
       //快速选人-------------------------------------
     });
+
+    //获取组织树
+    const getOrgTree = () => {
+      let obj = {
+        keyword: "",
+        pageNo: 1,
+        pageSize: 10,
+      };
+      api
+        .getOrgTree(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            console.log("获取组织树成功", res);
+          }
+        })
+        .catch((err) => {
+          console.log("获取组织树失败", err);
+        });
+    };
+
     const closeDrawer = () => {
       state.activeKey = "1";
       ctx.emit("update:ProjOwnervisible", false);
@@ -625,6 +634,8 @@ export default {
       window.addEventListener("resize", getClientHeight, false);
       //  window.addEventListener("resize", getClientHeightSelecteds, false);
       // judgeUrl();
+
+      getOrgTree();
     });
     onUnmounted(() => {
       window.removeEventListener("resize", getClientHeight, false);
@@ -665,31 +676,50 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     const selectedsHeight = () => {
       let resize = elementResizeDetectorMaker();
-      resize.listenTo(document.getElementById('ProjOwnership').querySelector("#selecteds"), function (ele) {
-        console.log("ele", ele.offsetHeight);
-        if (ele.offsetHeight > 160 && !state.showHidden) {
-          state.showMore = true;
-          document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
-         document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
-        } else if (ele.offsetHeight < 160) {
-          state.showMore = false;
-          state.showHidden = false;
-         document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
-          document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
+      resize.listenTo(
+        document.getElementById("ProjOwnership").querySelector("#selecteds"),
+        function (ele) {
+          console.log("ele", ele.offsetHeight);
+          if (ele.offsetHeight > 160 && !state.showHidden) {
+            state.showMore = true;
+            document
+              .getElementById("ProjOwnership")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ProjOwnership")
+              .querySelector("#selectedsBox").style.height = "160px";
+          } else if (ele.offsetHeight < 160) {
+            state.showMore = false;
+            state.showHidden = false;
+            document
+              .getElementById("ProjOwnership")
+              .querySelector("#selectedsBox").style.overflow = "hidden";
+            document
+              .getElementById("ProjOwnership")
+              .querySelector("#selectedsBox").style.height = "160px";
+          }
         }
-      });
+      );
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
-      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "";
-      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "";
+      document
+        .getElementById("ProjOwnership")
+        .querySelector("#selectedsBox").style.overflow = "";
+      document
+        .getElementById("ProjOwnership")
+        .querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
-      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
-      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
+      document
+        .getElementById("ProjOwnership")
+        .querySelector("#selectedsBox").style.overflow = "hidden";
+      document
+        .getElementById("ProjOwnership")
+        .querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------
@@ -704,6 +734,10 @@ export default {
       state.selectedRowKeys = []; //表格选中的key
       //快速选人-------------------------------------
     };
+
+    const expandTree = (e) => {
+      console.log("展开", e);
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -717,6 +751,7 @@ export default {
       morePeopleHidden,
 
       deleteAll,
+      expandTree,
     };
   },
 };
@@ -1164,7 +1199,7 @@ export default {
         }
       }
       .right {
-        width: 320px;
+        width: 340px;
         flex-shrink: 0;
         overflow-y: auto;
         .onerow {
@@ -1176,11 +1211,15 @@ export default {
           .onleft {
             display: flex;
             text-align: center;
+            justify-content: space-between;
+            align-items: center;
+            flex-wrap: wrap;
+            margin-left: 32px;
             .already {
               color: rgba(51, 51, 51, 1);
               font-size: 16px;
               font-weight: 500;
-              margin-left: 32px;
+
               white-space: nowrap;
               // margin-bottom: 20px;
             }
@@ -1194,9 +1233,35 @@ export default {
               font-size: 16px;
               font-weight: 500;
             }
+            .chose {
+              // width: 64px;
+              padding-left: 10px;
+              padding-right: 10px;
+              height: 24px;
+              // margin-top: 25px;
+              // margin-right: 25px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              border-radius: 2px;
+              border: 1px solid rgba(56, 139, 225, 1);
+              color: rgba(56, 139, 225, 1);
+              font-size: 12px;
+              position: relative;
+              flex-shrink: 0;
+              .ch {
+                position: absolute;
+                width: 18px;
+                height: 18px;
+                background-image: url(../../assets/images/basicinfo/ch.png);
+                right: -8px;
+                top: -8px;
+              }
+            }
           }
           .clbox {
             margin-left: 30px;
+            margin-bottom: 20px;
             display: flex;
             justify-content: center;
             align-items: center;
@@ -1248,30 +1313,6 @@ export default {
           margin-left: 32px;
           min-height: 100px;
           // overflow: hidden;
-          .chose {
-            // width: 64px;
-            padding-left: 10px;
-            padding-right: 10px;
-            height: 24px;
-            margin-top: 25px;
-            margin-right: 25px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 2px;
-            border: 1px solid rgba(56, 139, 225, 1);
-            color: rgba(56, 139, 225, 1);
-            font-size: 12px;
-            position: relative;
-            .ch {
-              position: absolute;
-              width: 18px;
-              height: 18px;
-              background-image: url(../../assets/images/basicinfo/ch.png);
-              right: -8px;
-              top: -8px;
-            }
-          }
         }
       }
     }
diff --git a/src/views/courselibrary/CourseManage.vue b/src/views/courselibrary/CourseManage.vue
index fb6beea2..c128f5d5 100644
--- a/src/views/courselibrary/CourseManage.vue
+++ b/src/views/courselibrary/CourseManage.vue
@@ -2,19 +2,20 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-17 16:27:22
+ * @LastEditTime: 2022-11-22 20:13:01
  * @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <!-- 课件管理页面 -->
 <template>
   <div class="courseManage">
-   <iframe
-          id="iframe"
-          style="width:100%l;height:100%"
-          src="https://u-pre.boe.com/pc/iframe/course/coursewares"
-          name="myframe"
-        ></iframe>
+    <iframe
+      id="iframe"
+      style="width: 100%l; height: 100%"
+      src="https://u-pre.boe.com/pc/iframe/course/coursewares"
+      name="myframe"
+      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+    ></iframe>
   </div>
 </template>
 <script>
@@ -24,17 +25,14 @@ export default {
   name: "CourseManage",
 
   setup() {
-    const state = reactive({
-    
-    });
+    const state = reactive({});
 
     onMounted(() => {
       // console.log("执行");
     });
-   
+
     return {
       ...toRefs(state),
-     
     };
   },
 };
@@ -45,6 +43,5 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
- 
 }
 </style>
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 9958aeb4..9979a4ce 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -307,6 +307,10 @@
               @change="classificationChange4"
               placeholder="请选择培训分类"
               :disabled="viewDetail ? true : false"
+              :fieldNames="{
+                label: 'dictName',
+                value: 'dictCode',
+              }"
             />
           </div>
         </div>
@@ -420,153 +424,17 @@ export default {
     const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
-    const isEdit = ref(false);
-    let peojectID = "";
-    console.log("store.state.orgtreeList", store.state.orgtreeList);
-    if (routers.query.projectId) {
-      storage.set("projectAddId", routers.query.projectId);
-      isEdit.value = true;
-      peojectID = routers.query.projectId;
-      // 需要编辑
-      api
-        .getProjectDetail({ projectId: routers.query.projectId })
-        .then((res) => {
-          if (res.status == 200 && res.data.code == 200) {
-            let info = res.data.data.projectInfo;
-            console.log(info);
-            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-            projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category
-            imageUrl.value = info.picUrl;
-
-            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-            state.rangevalue = [
-              dayjs(start, "YYYY/MM/DD"),
-              dayjs(end, "YYYY/MM/DD"),
-            ];
-
-            let manageName = info.manager.split(",");
-            let manageValue = info.managerId.split(",");
-            let optionsManage = [];
-            for (let i = 0; i < manageName.length; i++) {
-              let obj = {
-                label: manageName[i],
-                value: manageValue[i],
-              };
-              optionsManage.push(obj);
-            }
-            console.log(optionsManage);
-            state.classifySelect1 = optionsManage;
-            state.classifySelect2 =
-              classifyList2.value[info.sourceBelongId - 1];
-            remark.value = info.remark;
-            state.checked = info.boeFlag ? info.boeFlag : false;
-            state.classifySelect3 = classifyList3.value[info.level];
-            state.classifySelect4 = classifyList4.value[info.systemId - 1];
-            state.checked1 = info.boeFlag ? info.boeFlag : false;
-            // fileList1.value = info.attach.split(",");
-
-            projectType = 1;
-            picUrl = info.picUrl;
-            beginTime = Number(info.beginTime / 1000);
-            endTime = Number(info.endTime / 1000);
-            manager = info.manager;
-            managerId = info.managerId;
-            sourceBelongIdC = Number(info.sourceBelongId);
-            courseSyncFlag = info.courseSyncFlag;
-            levels = info.level;
-            systemid = info.systemId;
-            boeFlag = info.boeFlag;
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    } else {
-      if (storage.get("projectAddId")) {
-        isEdit.value = true;
-        peojectID = storage.get("projectAddId");
-        // 需要编辑
-        api
-          .getProjectDetail({ projectId: storage.get("projectAddId") })
-          .then((res) => {
-            if (res.status == 200 && res.data.code == 200) {
-              let info = res.data.data.projectInfo;
-              console.log("我是从本地存储获取的id", info);
-              projectName.value = info.name;
-              state.classifySelect = classifyList.value[1]; // info.category
-              imageUrl.value = info.picUrl;
-
-              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-              state.rangevalue = [
-                dayjs(start, "YYYY/MM/DD"),
-                dayjs(end, "YYYY/MM/DD"),
-              ];
-
-              let manageName = info.manager.split(",");
-              let manageValue = info.managerId.split(",");
-              let optionsManage = [];
-              for (let i = 0; i < manageName.length; i++) {
-                let obj = {
-                  label: manageName[i],
-                  value: manageValue[i],
-                };
-                optionsManage.push(obj);
-              }
-              console.log(optionsManage);
-              state.classifySelect1 = optionsManage;
-              state.classifySelect2 =
-                classifyList2.value[info.sourceBelongId - 1];
-              remark.value = info.remark;
-              state.checked = info.boeFlag ? info.boeFlag : false;
-              state.classifySelect3 = classifyList3.value[info.level];
-              state.classifySelect4 = classifyList4.value[info.systemId - 1];
-              state.checked1 = info.boeFlag ? info.boeFlag : false;
-
-              projectType = 1;
-              picUrl = info.picUrl;
-              beginTime = Number(info.beginTime / 1000);
-              endTime = Number(info.endTime / 1000);
-              manager = info.manager;
-              managerId = info.managerId;
-              sourceBelongIdC = Number(info.sourceBelongId);
-              courseSyncFlag = info.courseSyncFlag;
-              levels = info.level;
-              systemid = info.systemId;
-              boeFlag = info.boeFlag;
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
-      }
-    }
-
-    const backPage = () => {
-      storage.remove("projectAddId");
-      setTimeout(() => {
-        router.push({
-          path: "/projectmanage",
-        });
-      }, 400);
-    };
-
     const router = useRouter();
     const state = reactive({
-      classifySelect: null,
-      classifySelectId: null,
-      checked: false,
-      checked1: false,
-      valueE: null,
-      valueE1: null,
-      valueE2: null,
-      classifySelect1: [],
-      classifySelect2: null,
-      classifySelect3: [],
-      classifySelect4: [],
-      rangevalue: [],
+      classifySelect: null, //分类选择信息
+      projectType: null, //分类选择的id
+      checked: false, //同步学习记录
+      checked1: false, //BOEU实施
+      classifySelect1: [], //选中项目经理名称数组
+      classifySelect2: null, //选中的资源归属信息
+      classifySelect3: null, //选中的项目级别信息
+      classifySelect4: null, //选中的培训分类信息
+      rangevalue: [], //项目时间
 
       currentPage: 1, //当前页
       tableDataTotal: -1, //模版列表总数
@@ -574,10 +442,21 @@ export default {
       totalPages: 0, //总页数
       viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
     });
-
-    const projectName = ref("");
-    //分类
+    //分类列表
     const classifyList = ref([]);
+
+    //项目封面
+    const imageUrl = ref("");
+    // 项目级别
+    const classifyList3 = ref([
+      // { value: 1, label: "集团级" },
+    ]);
+
+    // 培训分类
+    const classifyList4 = ref([
+      // { value: 1, label: "集团级" },
+    ]);
+    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
     const getDictList = (param) => {
       let obj = {
         pageNo: 1,
@@ -595,11 +474,15 @@ export default {
             if (param === "projectPic") {
               if (res.data.data.rows.length > 0) {
                 imageUrl.value = res.data.data.rows[0].dictValue;
+                picUrl = res.data.data.rows[0].dictValue;
               }
             }
             if (param === "projectLevel") {
               classifyList3.value = res.data.data.rows;
             }
+            if (param === "projectSys") {
+              classifyList4.value = res.data.data.rows;
+            }
           }
         })
         .catch((err) => {
@@ -609,11 +492,164 @@ export default {
     getDictList("projectClass");
     getDictList("projectPic");
     getDictList("projectLevel");
+    getDictList("projectSys");
+    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
 
-    let projectType = "";
+    const isEdit = ref(false);
+    let peojectID = ""; //项目id
+    console.log("store.state.orgtreeList", store.state.orgtreeList);
+    const editProject = () => {
+      if (routers.query.projectId) {
+        storage.set("projectAddId", routers.query.projectId);
+        isEdit.value = true;
+        peojectID = routers.query.projectId;
+        // 需要编辑
+        api
+          .getProjectDetail({ projectId: routers.query.projectId })
+          .then((res) => {
+            if (res.status == 200 && res.data.code == 200) {
+              let info = res.data.data.projectInfo;
+              console.log(
+                "classifyList.value.find(item=>item.dictCode===info.category)",
+                classifyList.value.find((item) => {
+                  if (item.dictCode == 11) {
+                    return item.dictName;
+                  }
+                  // return item.dictName;
+                }),
+                classifyList.value,
+                info.category
+              );
+
+              console.log(info);
+              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+              projectName.value = info.name; //项目名称
+              // state.classifySelect =classifyList.value.find(item=>item.dictCode===info.category) ; // info.category 项目分类
+              state.projectType = 1; //分类选择的id
+
+              imageUrl.value = info.picUrl; //封面图
+
+              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD"); //开始时间
+              let end = toDate(info.endTime / 1000, "YYYY/MM/DD"); //结束时间
+              state.rangevalue = [
+                dayjs(start, "YYYY/MM/DD"),
+                dayjs(end, "YYYY/MM/DD"),
+              ];
+
+              let manageName = info.manager.split(","); //项目经理
+              let manageValue = info.managerId.split(","); //项目经理id数组
+              let optionsManage = [];
+              for (let i = 0; i < manageName.length; i++) {
+                let obj = {
+                  label: manageName[i],
+                  value: manageValue[i],
+                };
+                optionsManage.push(obj);
+              }
+              console.log(optionsManage);
+              state.classifySelect1 = optionsManage;
+              state.classifySelect2 =
+                classifyList2.value[info.sourceBelongId - 1];
+              remark.value = info.remark;
+              state.checked = info.boeFlag ? info.boeFlag : false;
+              state.classifySelect3 = classifyList3.value[info.level];
+              state.classifySelect4 = classifyList4.value[info.systemId - 1];
+              state.checked1 = info.boeFlag ? info.boeFlag : false;
+              // fileList1.value = info.attach.split(",");
+
+              picUrl = info.picUrl;
+              beginTime = Number(info.beginTime / 1000);
+              endTime = Number(info.endTime / 1000);
+              manager = info.manager;
+              managerId = info.managerId;
+              sourceBelongIdC = Number(info.sourceBelongId);
+              courseSyncFlag = info.courseSyncFlag;
+              levels = info.level;
+              systemid = info.systemId;
+              boeFlag = info.boeFlag;
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else {
+        if (storage.get("projectAddId")) {
+          isEdit.value = true;
+          peojectID = storage.get("projectAddId");
+          // 需要编辑
+          api
+            .getProjectDetail({ projectId: storage.get("projectAddId") })
+            .then((res) => {
+              if (res.status == 200 && res.data.code == 200) {
+                let info = res.data.data.projectInfo;
+                console.log("我是从本地存储获取的id", info);
+                projectName.value = info.name;
+                state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息
+                state.projectType = 1; //分类选择的id
+                imageUrl.value = info.picUrl;
+
+                let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+                let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+                state.rangevalue = [
+                  dayjs(start, "YYYY/MM/DD"),
+                  dayjs(end, "YYYY/MM/DD"),
+                ];
+
+                let manageName = info.manager.split(",");
+                let manageValue = info.managerId.split(",");
+                let optionsManage = [];
+                for (let i = 0; i < manageName.length; i++) {
+                  let obj = {
+                    label: manageName[i],
+                    value: manageValue[i],
+                  };
+                  optionsManage.push(obj);
+                }
+                console.log(optionsManage);
+                state.classifySelect1 = optionsManage;
+                state.classifySelect2 =
+                  classifyList2.value[info.sourceBelongId - 1];
+                remark.value = info.remark;
+                state.checked = info.boeFlag ? info.boeFlag : false;
+                state.classifySelect3 = classifyList3.value[info.level];
+                state.classifySelect4 = classifyList4.value[info.systemId - 1];
+                state.checked1 = info.boeFlag ? info.boeFlag : false;
+
+                picUrl = info.picUrl;
+                beginTime = Number(info.beginTime / 1000);
+                endTime = Number(info.endTime / 1000);
+                manager = info.manager;
+                managerId = info.managerId;
+                sourceBelongIdC = Number(info.sourceBelongId);
+                courseSyncFlag = info.courseSyncFlag;
+                levels = info.level;
+                systemid = info.systemId;
+                boeFlag = info.boeFlag;
+              }
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+        }
+      }
+    };
+    editProject();
+
+    const backPage = () => {
+      storage.remove("projectAddId");
+      setTimeout(() => {
+        router.push({
+          path: "/projectmanage",
+        });
+      }, 400);
+    };
+
+    const projectName = ref(""); //项目名称
+
+    //选择分类
     const classificationChange = (value) => {
       console.log(`selected ${value}`);
-      projectType = value;
+      state.projectType = value; //分类选择的id
     };
 
     function getBase64(img, callback) {
@@ -625,8 +661,8 @@ export default {
     const fileList = ref([]);
     const fileList1 = ref([]);
     const loading = ref(false);
-    const imageUrl = ref("");
-    let picUrl = "";
+
+    let picUrl = ""; //项目封面
 
     const handleChange = (info) => {
       if (info.file.status === "uploading") {
@@ -727,7 +763,6 @@ export default {
       beginTime = new Date(dateString[0]).getTime() / 1000;
       endTime = new Date(dateString[1]).getTime() / 1000;
     };
-
     // 项目经理 后续接口调用
     const classifyList1 = ref([
       { value: 1, label: "李俊国" },
@@ -735,6 +770,7 @@ export default {
       { value: 3, label: "刘孟君" },
     ]);
 
+    //选择处理项目经理
     let manager = "";
     let managerId = "";
     const classificationChange1 = (key, options) => {
@@ -774,28 +810,14 @@ export default {
       sourceBelongIdC = key;
     };
 
-    // 项目级别
-    const classifyList3 = ref([
-      // { value: 1, label: "集团级" },
-      // { value: 2, label: "组织级" },
-      // { value: 3, label: "现地级" },
-      // { value: 4, label: "部门级" },
-    ]);
-
+    //选择项目级别
     let levels = "";
     const classificationChange3 = (key) => {
       console.log(`selected ${key}`, classifyList3);
       levels = key;
     };
 
-    // 培训分类
-    const classifyList4 = ref([
-      { value: 1, label: "集团级" },
-      { value: 2, label: "组织级" },
-      { value: 3, label: "现地级" },
-      { value: 4, label: "部门级" },
-    ]);
-
+    //选择培训分类
     let systemid = "";
     const classificationChange4 = (key) => {
       console.log(`selected ${key}`, classifyList4);
@@ -824,7 +846,9 @@ export default {
             console.log(info);
             // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
             projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category
+            state.classifySelect = classifyList.value[1]; // info.category  分类选择的信息
+            state.projectType = 1; //分类选择的id
+
             imageUrl.value = info.picUrl;
 
             let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
@@ -855,7 +879,6 @@ export default {
             state.checked1 = info.boeFlag ? info.boeFlag : false;
             // fileList1.value = info.attach.split(",");
 
-            projectType = 1;
             picUrl = info.picUrl;
             beginTime = Number(info.beginTime / 1000);
             endTime = Number(info.endTime / 1000);
@@ -924,19 +947,22 @@ export default {
     // 项目说明
     const remark = ref("");
 
+    //同步学习记录------------------------------------
     let courseSyncFlag = 0;
     const changeChecked = () => {
       console.log(state.checked);
       state.checked ? (state.checked = false) : (state.checked = true);
       courseSyncFlag = state.checked ? 1 : 0;
     };
-
+    //同步学习记录------------------------------------
+    //BOEU实施--------------------------------------
     let boeFlag = 0;
     const changeChecked1 = () => {
       console.log(state.checked1);
       state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
       boeFlag = state.checked1 ? 1 : 0;
     };
+    //BOEU实施--------------------------------------
 
     const removeFile = (file) => {
       const index = fileList1.value.indexOf(file);
@@ -980,7 +1006,7 @@ export default {
         let obj = {
           projectId: Number(peojectID),
           name: projectName["value"],
-          category: projectType,
+          category: state.projectType, //分类选择的id
           picUrl: picUrl,
           beginTime: beginTime,
           endTime: endTime,
@@ -1037,7 +1063,7 @@ export default {
       } else {
         let obj = {
           name: projectName["value"],
-          category: projectType,
+          category: state.projectType, //分类选择的id
           picUrl: picUrl,
           beginTime: beginTime,
           endTime: endTime,
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 950929d5..19b9b82e 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -2047,13 +2047,16 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.status == 0
+              {value.record.status == 0 ||
+              value.record.status == 1 ||
+              value.record.status == 2 ||
+              value.record.status == -2
                 ? "草稿"
-                : value.record.status == 1 &&
+                : value.record.status == 3 &&
                   Number(value.record.beginTime) <
                     Math.ceil(new Date().getTime() / 1000)
                 ? "进行中"
-                : value.record.status == 1 &&
+                : value.record.status == 3 &&
                   Number(value.record.beginTime) >
                     Math.ceil(new Date().getTime() / 1000) &&
                   value.record.type !== 1 &&
@@ -2074,6 +2077,36 @@ export default {
         width: 100,
         align: "center",
       },
+      {
+        title: "是否审核",
+        dataIndex: "status",
+        // width: "30%",
+        key: "status",
+        width: 100,
+        align: "center",
+        customRender: (value) => {
+          {
+            console.log("获取项目", value);
+          }
+          return (
+            <div>
+              {value.record.type !== 3
+                ? "-"
+                : value.record.status == 0
+                ? "未审核"
+                : value.record.status == 1
+                ? "审核中"
+                : value.record.status == 2 ||
+                  value.record.status == 3 ||
+                  value.record.status == -1
+                ? "已审核"
+                : value.record.status == -2
+                ? "未通过"
+                : "-"}
+            </div>
+          );
+        },
+      },
       {
         title: "创建时间",
         dataIndex: "createTime",
@@ -2094,7 +2127,10 @@ export default {
         customRender: (value) => {
           // console.log("value", value.record.type, value.record.status);
           return value.record.type === 1 ? (
-            value.record.status === 0 ? (
+            value.record.status === 0 ||
+            value.record.status === 1 ||
+            value.record.status === 2 ||
+            value.record.status === -2 ? (
               <div class="operation">
                 <span
                   onClick={() => {
@@ -2214,7 +2250,7 @@ export default {
                   </a-select>
                 </div>
               </div>
-            ) : value.record.status === 1 ? (
+            ) : value.record.status === 3 ? (
               <div class="operation">
                 <span class="operation1">查看</span>
                 <div class="tableSelect">
@@ -2404,7 +2440,10 @@ export default {
               <div></div>
             )
           ) : value.record.type === 2 ? (
-            value.record.status === 0 ? (
+            value.record.status === 0 ||
+            value.record.status === 1 ||
+            value.record.status === 2 ||
+            value.record.status === -2 ? (
               <div class="operation">
                 <span
                   onClick={() => {
@@ -2515,7 +2554,7 @@ export default {
                   </a-select>
                 </div>
               </div>
-            ) : value.record.status === 1 ? (
+            ) : value.record.status === 3 ? (
               <div class="operation">
                 <span class="operation1">查看</span>
                 <div class="tableSelect">
@@ -2812,7 +2851,23 @@ export default {
                   </a-select-option>
                 </a-select>
               </div>
-              {value.record.status === 0 ? (
+              {value.record.status === 0 || value.record.status === -2 ? (
+                <span
+                  onClick={() => {}}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
+                  提交审核
+                </span>
+              ) : value.record.status === 1 ? (
+                <span
+                  onClick={() => {}}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
+                  撤回审核
+                </span>
+              ) : value.record.status === 2 ? (
                 <span
                   onClick={() => {
                     console.log("value.record", value.record);
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d46173ad..5e63abc7 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -794,7 +794,7 @@
             <div class="line"></div>
             <div class="search">
               <div class="left">
-                <div class="name">
+                <!-- <div class="name">
                   <div class="text">姓名：</div>
                   <a-input
                     v-model:value="valueName"
@@ -806,7 +806,7 @@
                       margin-left: 5px;
                     "
                   />
-                </div>
+                </div> -->
                 <div class="time">
                   <div class="text">选择时间：</div>
                   <a-range-picker
@@ -864,7 +864,7 @@
               <div class="rank">
                 <div class="rankhead">
                   <div class="inhead">
-                    <div class="left">学分排行 Top10</div>
+                    <div class="left">积分排行 Top10</div>
                     <div class="right">
                       <a-select
                         v-model:value="valuestu3"
@@ -889,7 +889,7 @@
               <div class="rank">
                 <div class="rankhead">
                   <div class="inhead">
-                    <div class="left">学识排行 Top10</div>
+                    <div class="left">学时排行 Top10</div>
                     <div class="right">
                       <a-select
                         v-model:value="valuestu4"
@@ -1766,16 +1766,25 @@ export default {
       // projectId:"", //项目任务id
       projectTaskId: "", //项目任务任务id
       //进度排行学员
-      rankjindu: [{ value: "学员", label: "学员" }],
+      rankjindu: [
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
+      ],
       valuestu1: "学员",
       //进度排行阶段
       rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
       valuestu2: "第一阶段",
-      //学分排行
-      rankxuefen: [{ value: "学员", label: "学员" }],
+      //积分排行
+      rankxuefen: [
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
+      ],
       valuestu3: "学员",
-      //学识排行
-      rankxueshi: [{ value: "学员", label: "学员" }],
+      //学时排行
+      rankxueshi: [
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
+      ],
       valuestu4: "学员",
       visible: false, //时间管理
       FaceVisivle: false, //面授管理
@@ -1962,53 +1971,53 @@ export default {
         {
           rank: "1",
           name: "哈哈",
-          jd: "80%",
+          jd: "80",
         },
 
         {
           rank: "2",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "3",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "4",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "5",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "6",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "7",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "8",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "9",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "10",
           name: "哈哈",
-          jd: "70%",
+          jd: "7",
         },
       ],
       xuefentablecolumns: [
@@ -2056,7 +2065,7 @@ export default {
         },
 
         {
-          title: "进度",
+          title: "积分",
           dataIndex: "jd",
           key: "jd",
           width: 50,
@@ -2064,58 +2073,58 @@ export default {
           className: "h",
         },
       ],
-      //学识排行表
+      //学时排行表
       xueshitabledata: [
         {
           rank: "1",
           name: "哈哈",
-          jd: "80%",
+          jd: "8",
         },
 
         {
           rank: "2",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "3",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "4",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "5",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "6",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "7",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "8",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "9",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
         {
           rank: "10",
           name: "哈哈",
-          jd: "70%",
+          jd: "70",
         },
       ],
       xueshitablecolumns: [
@@ -2163,7 +2172,7 @@ export default {
         },
 
         {
-          title: "进度",
+          title: "时长",
           dataIndex: "jd",
           key: "jd",
           width: 50,

From a1bbb3bd2b762475cb93e8b435513803d463f7c8 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 22 Nov 2022 22:46:03 +0800
Subject: [PATCH 89/90] =?UTF-8?q?fix=EF=BC=9A=E5=85=B3=E8=81=94=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 166 +++++++++++++---------
 1 file changed, 100 insertions(+), 66 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 6780fa61..f7915e81 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -703,7 +703,7 @@
             title="关联项目"
             placement="right"
             width="80%"
-            @after-visible-change="afterVisibleChange"
+            @after-visible-change="afterProjVisibleChange"
           >
             <div class="drawerMain">
               <div class="header">
@@ -1051,7 +1051,7 @@ import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
 import * as apiProj from "../../api/index.js";
 import { RouterEditTask } from "@/api/indexTask";
-import dayjs from "dayjs";
+// import dayjs from "dayjs";
 import { toDate } from "../../api/method";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
@@ -1173,7 +1173,6 @@ export default {
           time: "2022-07-15 14:00",
         },
       ],
-      drawertableData: [],
       // drawertableData: [
       //   {
       //     key: 1,
@@ -1261,6 +1260,7 @@ export default {
       //     time: "2022-07-20 14:00:03",
       //   },
       // ],
+      drawertableData: [],
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
@@ -1326,8 +1326,8 @@ export default {
       picUrl: null,
       //项目抽屉参数
       time: undefined,
-      assessmentId: null,
-      assessmentName: "",
+      projId: null, //选项选到的id
+      projName: "", //选项选到的name
       projectId: null,
       projectTaskId: null,
       chooseStageId: null,
@@ -1454,52 +1454,59 @@ export default {
       state.EditWorkId = id;
       state.routerTaskId = eleId;
     };
-    // 作业和考试的抽屉
+    // 作业抽屉
     const showDrawerAddHomework = (id, eleId) => {
       console.log("homework==============", id, state.isactive);
       state.addhomeworkvisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
     };
+    //考试抽屉
     const showDrawerAddTest = (id, eleId) => {
       state.addtestvisible = true;
       state.EditTestId = id;
       state.routerTaskId = eleId;
     };
-    //测试评估投票抽屉
+    //测试抽屉
     const showDrawerAddEval = (id, eleId) => {
       // state.addevalVisible = true;
       state.addevalvisible = true;
       state.EditEvalId = id;
       state.routerTaskId = eleId;
     };
+    //评估抽屉
     const showDrawerAddInvist = (id, eleId) => {
       // state.addinvistVisible = true;
       state.addinvistvisible = true;
       state.routerTaskId = eleId;
       state.EditInvistId = id;
     };
+    //投票抽屉
     const showDrawerAddVote = (id, eleId) => {
       // state.addhomeworkvisible = true;
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.routerTaskId = eleId;
     };
+    //直播抽屉
     const showDrawerAddLive = (id, eleId) => {
       state.addlivevisible = true;
       state.EditLiveId = id;
       state.routerTaskId = eleId;
     };
+    //外链抽屉
     const showDrawerAddRef = (id, eleId) => {
       state.addrefvisible = true;
       state.EditRefId = id;
       state.routerTaskId = eleId;
     };
+    //讨论抽屉
     const showDrawerAddDiscuss = (id, eleId) => {
       state.adddiscussvisible = true;
       state.EditDiscussId = id;
       state.routerTaskId = eleId;
     };
+    //活动抽屉
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.EditActiveId = id;
@@ -1511,7 +1518,7 @@ export default {
       state.EditActiveId = id;
       state.routerTaskId = eleId;
     };
-    // tableData数据赋值方法
+    //tableData数据赋值方法
     const dataAssignment = (id) => {
       console.log(state.level);
       for (let i = 0; i < state.level.length; i++) {
@@ -1579,9 +1586,10 @@ export default {
     const closeDrawer = () => {
       state.visible = false;
     };
-
-    const afterVisibleChange = (bool) => {
-      console.log("visible", bool);
+    const afterProjVisibleChange = (bol) => {
+      if(bol == true){
+        getAllProjText()
+      }
     };
     const showAddStu = () => {
       state.AddSvisible = true;
@@ -1698,38 +1706,9 @@ export default {
         {
           title: "项目名称",
           dataIndex: "name",
-          // dataIndex: "projectName",
           key: "projectName",
           width: 200,
-          // align: "center",
           ellipsis: true,
-          // scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.key);
-            if (!text.record.children) {
-              return (
-                <div style={{ display: "flex" }}>
-                  <a-checkbox
-                    checked={
-                      state.projectChecked === text.record.key ? true : false
-                    }
-                    value={text.record.key}
-                    onChange={() => {
-                      // console.log("改变了", text.record.key);
-                      if (state.projectChecked === text.record.key) {
-                        state.projectChecked = null;
-                      } else {
-                        state.projectChecked = text.record.key;
-                      }
-                    }}
-                  ></a-checkbox>
-                  <span style="margin-left: 5px">{text.text}</span>
-                </div>
-              );
-            } else {
-              return <span>{text.text}</span>;
-            }
-          },
         },
         {
           title: "项目经理",
@@ -1741,7 +1720,6 @@ export default {
         {
           title: "创建人",
           dataIndex: "creator",
-          // width: "30%",
           key: "creater",
           width: 100,
           align: "center",
@@ -2008,45 +1986,100 @@ export default {
           "selected",
           selected
         );
-        console.log(selectedRows.assessmentId);
-        state.assessmentId = selectedRows.assessmentId;
-        state.assessmentName = selectedRows.name;
+        state.projId = selectedRows.parentId;
+        state.projName = selectedRows.name;
       },
     };
     const getTableDate = (drawertableData) => {
-      let data = drawertableData;
-      let array = [];
-      data.map((value, index) => {
+      console.log(drawertableData,'drawertableDatadrawertableDatadrawertableDatadrawertableData')
+      let data = drawertableData
+      let array = []
+    data.map((value)=>{
+      if(value.type ==3){
         let obj = {
-          key: index,
-          assessmentId: value.assessmentId,
-          num: value.essayQuestionVoList.length,
-          name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
-        };
-        array.push(obj);
-      });
+                key: value.projectId,
+                parentId:value.parentId,
+                name: value.name,
+                manager:value.manager,
+                creator: value.createName,
+                // time: dayjs(value.createTime).format("YYYY-MM-DD"),
+              };
+              array.push(obj);
+      }
+      else if(value.type == 2){
+        value.subList.map((item)=>{
+          let obj = {
+                key: value.projectId,
+                parentId:value.parentId,
+                name: value.name,
+                manager:value.manager,
+                creator: value.createName,
+                // time: dayjs(value.createTime).format("YYYY-MM-DD"),
+                  children:[{
+                    key: item.projectId,
+                    parentId:item.parentId,
+                    name: item.name,
+                    manager:item.manager,
+                    creator: item.createName,
+                    // time: dayjs(value.createTime).format("YYYY-MM-DD"),
+                  }]
+          }
+          array.push(obj);
+        })
+      }
+      else{
+            value.subList.map((item)=>{
+              item.subList.map((items)=>{
+                let obj = {
+                key: value.projectId,
+                parentId:value.parentId,
+                name: value.name,
+                manager:value.manager,
+                creator: value.createName,
+                // time: dayjs(value.createTime).format("YYYY-MM-DD"),
+                  children:[{
+                    key: item.projectId,
+                    parentId:item.parentId,
+                    name: item.name,
+                    manager:item.manager,
+                    creator: item.createName,
+                    children:[{
+                      key: items.projectId,
+                      parentId:items.parentId,
+                      name: items.name,
+                      manager:items.manager,
+                      creator: items.createName,
+                    }]
+                    // time: dayjs(value.createTime).format("YYYY-MM-DD"),
+                  }]
+                }
+                array.push(obj);
+              })
+            })
+      }
+    })
+
       state.drawertableData = array;
+      console.log(state.drawertableData,"------------state.drawertableData---------------");
     };
     //获取全部项目信息接口
     const getAllProjText = () => {
       apiProj
         .getProjectList({
-          beginTime: 0,
-          createName: "",
-          endTime: 0,
-          manager: "",
-          name: "",
-          pageNo: 0,
-          pageSize: 0,
-          status: 0,
+          "beginTime": 0,
+          "createName": "",
+          "endTime": "",
+          "manager": "",
+          "name": "",
+          "pageNo": 1,
+          "pageSize": 10,
+          "status": 0
         })
         .then((res) => {
           let arr = res.data.data.rows;
           if (res.status === 200) {
             getTableDate(arr);
-            console.log("---------------项目信息---------------------------");
+            console.log("---------------项目信息---------------------------",res.data.data);
           }
         })
         .catch((err) => {
@@ -2055,6 +2088,7 @@ export default {
           // state.createLoading = false;
         });
     };
+    //不需要下面这个添加应该  没选数据
     const updateTask = () => {
       RouterEditTask({
         chapterId: state.isactive,
@@ -2092,7 +2126,7 @@ export default {
       closeDrawer,
       showModal,
       closeModal,
-      afterVisibleChange,
+      afterProjVisibleChange,
       showAddStu,
       showImpStu,
       // drawercolumns,

From 1636fbfd6f73317c88254c861b2149874a8d5148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Wed, 23 Nov 2022 15:35:00 +0800
Subject: [PATCH 90/90] =?UTF-8?q?feat=20:=20=E6=A8=A1=E6=9D=BF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=EF=BC=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                          |  5 +-
 src/views/projectcenter/LibraryAdd.vue      | 14 +--
 src/views/projectcenter/TemplateLibrary.vue | 99 +++++++--------------
 src/views/projectcenter/temTask.vue         |  9 +-
 src/views/projectcenter/templateAdd.vue     | 82 +++--------------
 5 files changed, 58 insertions(+), 151 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 9056d61c..9b93baab 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -22,7 +22,7 @@ export default createStore({
 
     assessmentName: "",
     routerId: null,
-
+    projectTemplateId:null,
     orgtreeList: [],
   },
   getters: {},
@@ -43,6 +43,9 @@ export default createStore({
     },
     getOrgtreeList(state, orgtreeList) {
       state.orgtreeList = orgtreeList;
+    },
+    SET_projectTemplateId (state,projectTemplateId) {
+      state.projectTemplateId = projectTemplateId;
     }
   },
   actions: {},
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 9ca65c2e..8f698d99 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -565,9 +565,11 @@ import { ref, reactive, defineComponent, toRefs, onMounted} from "vue";
 import { message } from "ant-design-vue";
 import * as api from "@/api/indexTemplate"
 import { useRouter } from "vue-router";
+import { useStore } from "vuex";
 export default defineComponent({
   name: "LibraryAdd",
   setup() {
+    const store = useStore();
     const state = reactive({
       //任务大纲列表
       taskSyllabus: [
@@ -761,11 +763,12 @@ export default defineComponent({
     onMounted(() => {getDetail()});
     // 获取详情
     const getDetail = () => {
-      api.templateDetail(1).then(res => {
+      api.templateDetail(store.state.projectTemplateId).then(res => {
         state.taskSyllabus = []
         console.log(res);
         state.projectInfo.name = res.data.data.projectTemplateInfo.name
-        state.projectInfo.beginTime = res.data.data.projectTemplateInfo.createTime
+        let time  = new Date(Number(res.data.data.projectTemplateInfo.createTime))
+        state.projectInfo.beginTime = time.toLocaleDateString()
         state.projectInfo.manager = res.data.data.projectTemplateInfo.manager
         state.projectInfo.notice = res.data.data.projectTemplateInfo.notice
         state.projectInfo.sourceBelongId = res.data.data.projectTemplateInfo.sourceBelongId
@@ -811,7 +814,7 @@ export default defineComponent({
         "notice": state.projectInfo.notice,
         "noticeFlag": 0,
         "picUrl": "",
-        "projectTemplateId": 0,
+        "projectTemplateId": store.state.projectTemplateId,
         "remark": "",
         "sourceBelongId": 0,
         "status": 0,
@@ -860,7 +863,7 @@ export default defineComponent({
     const stateEdit = () => {
       let obj={
         "name": "",
-        "projectTemplateId": 0,
+        "projectTemplateId": store.state.projectTemplateId,
         "remark": "",
         "stageId": 0
       }
@@ -880,7 +883,7 @@ export default defineComponent({
         "flag": true,
         "name": "",
         "projectTaskId": 0,
-        "projectTemplateId": 0,
+        "projectTemplateId": store.state.projectTemplateId,
         "stageId": 0,
         "type": 0
       }
@@ -920,7 +923,6 @@ export default defineComponent({
 <style lang="scss">
 .content7 {
     margin-top: 20px;
-
     .set_tit {
       margin-left: 34px;
       font-size: 18px;
diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index fbb16d91..0eaf0d2f 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -47,6 +47,8 @@
 <script>
 import { reactive, defineComponent, toRefs, onMounted } from "vue";
 import { message } from "ant-design-vue";
+import { useRouter } from "vue-router";
+import { useStore } from "vuex";
 import * as api from "@/api/indexTemplate"
 const columns1 = [
   {
@@ -90,6 +92,9 @@ const columns1 = [
 export default defineComponent({
   name: "TemplateLibrary",
   setup() {
+    const store = useStore();
+    // 编辑页面跳转过来时候，自动填充表格
+    const router = useRouter();
     const state = reactive({
       value1: null,
       tableData1: [
@@ -101,15 +106,6 @@ export default defineComponent({
           stutime: "2022-10-31  23:12:00",
           operation: "operation",
           projectTemplateId: 1,
-        },
-        {
-          key: "2",
-          name: "测试模板2",
-          status: "未发布",
-          creator: "李部长",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-          projectTemplateId: 2,
         }
       ],
     });
@@ -124,12 +120,10 @@ export default defineComponent({
                 {value.status === "已发布" ? (
                   <div class="nselect">
                     <div class="ops2">
-                      <router-link to="/libraryadd">
-                        <div class="jc">
+                        <div class="jc" onClick={() => {toLibraryAdd(value.projectTemplateId)}}>
                           查看{" "}
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
                         </div>
-                      </router-link>
                     </div>
                     <div class="ops3">
                       <div class="jc"
@@ -150,12 +144,10 @@ export default defineComponent({
                       </div>
                     </div>
                     <div class="ops2">
-                      <router-link to="/libraryadd">
-                        <div class="jc">
+                        <div class="jc" onClick={() => {toLibraryAdd(value.projectTemplateId)}}>
                           查看
                           <span style="color:#E9E9E9;margin-left:15px;">|</span>
                         </div>
-                      </router-link>
                     </div>
                     <div class="ops3">
                       <div class="jc"
@@ -189,26 +181,28 @@ export default defineComponent({
     const getLibraryList = () => {
       let obj = {
         "beginTime": 0,
-        "endTime": 0,
         "name": "",
         "pageNo": pagination.current,
         "pageSize": 10,
-        "status": 0 || 1
+        "status": 0
       }
       api.templateList(obj).then((res) => {
+        state.tableData1 = []
         console.log(res);
         let resData = res.data.data.rows
         if (resData.length) {
           for (let i in resData) {
-            state.tableData1[i].id = i + 1;
-            state.tableData1[i].projectTemplateId = resData[i].projectTemplateId;
-            state.tableData1[i].status = resData[i].status ? "已发布" : "未发布";
-            state.tableData1[i].name = resData[i].name;
-            state.tableData1[i].creator = resData[i].createName;
-            state.tableData1[i].stutime = resData[i].publishTime;
-            state.tableData1[i].operation = "operation";
+            state.tableData1.push({
+              id : i + 1,
+              projectTemplateId:resData[i].projectTemplateId,
+              status:resData[i].status ? "已发布" : "未发布",
+              name:resData[i].name,
+              creator:resData[i].createName,
+              stutime:resData[i].publishTime,
+              operation:"operation"
+            })
           }
-
+          getTableDate1()
         } else {
           message.warning("获取的列表数据为空值")
         }
@@ -227,55 +221,21 @@ export default defineComponent({
       })
     }
     const searchLevel = () => {
-      state.tableData1 = [
-        {
-          key: "1",
-          name: "测试模板1",
-          status: "已发布",
-          creator: "李部长",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-          projectTemplateId: 1,
-        },
-        {
-          key: "2",
-          name: "测试模板2",
-          status: "未发布",
-          creator: "李部长",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-          projectTemplateId: 2,
-        }
-      ];
-      const result = state.tableData1.filter(item => item.name.includes(state.value1))
-      state.tableData1 = result;
-      getTableDate1()
+      getLibraryList();
+      setTimeout(() => {
+        const result = state.tableData1.filter(item => item.name.includes(state.value1))
+        state.tableData1 = result;
+      },100)
     };
     const resetLevel = () => {
       state.value1 = '';
-      // getLibraryList();
-      state.tableData1 = [
-        {
-          key: "1",
-          name: "测试模板1",
-          status: "已发布",
-          creator: "李部长",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-          projectTemplateId: 1,
-        },
-        {
-          key: "2",
-          name: "测试模板2",
-          status: "未发布",
-          creator: "李部长",
-          stutime: "2022-10-31  23:12:00",
-          operation: "operation",
-          projectTemplateId: 2,
-        }
-      ]
+      getLibraryList();
       getTableDate1()
     };
+    const toLibraryAdd = (id) => {
+      router.push("/libraryAdd");
+      store.state.projectTemplateId = id
+    }
 
     return {
       ...toRefs(state),
@@ -284,6 +244,7 @@ export default defineComponent({
       searchLevel,
       resetLevel,
       pagination,
+      toLibraryAdd,
     };
   },
 });
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index 8d8420c9..85ce4986 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -1045,6 +1045,7 @@
   import draggable from "vuedraggable";
   import { storage } from "../../api/storage";
   import UnlockMode from "../../components/drawers/UnlockMode.vue";
+  import {useStore} from "vuex";
   // import * as api1 from "../../api/index1";
   
   const drawercolumns = [
@@ -1105,6 +1106,7 @@
       UnlockMode,
     },
     setup() {
+      const store = useStore();
       const state = reactive({
         projectId: storage.get("projectId")
           ? JSON.parse(storage.get("projectId"))
@@ -1507,8 +1509,7 @@
       const getTask = () => {
         state.tableData = []
         api
-          // .templateDetail(state.projectId || 1)
-          .templateDetail(1)
+          .templateDetail(store.state.projectTemplateId)
           .then((res) => {
             if (res.status == 200) {
               console.log("22222", res.data.data.stageList);
@@ -1706,7 +1707,7 @@
         if (state.updateStageID) {
           let obj = {
             name: state.valuesname,
-            projectTemplateId: 1,
+            projectTemplateId: store.state.projectTemplateId,
             remark: state.valuesnotice,
             stageId:state.updateStageID,
           };
@@ -1728,7 +1729,7 @@
         } else {
           let obj = {
             name: state.valuesname,
-            projectTemplateId: 1,
+            projectTemplateId: store.state.projectTemplateId,
             remark: state.valuesnotice,
             stageId:0,
           };
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index a763b47d..faab4b1c 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -311,17 +311,19 @@
   </div>
 </template>
   <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref,onMounted } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 // import dayjs from "dayjs";
 import * as api from "../../api/indexTemplate";
 import { storage } from "../../api/storage";
+import {useStore} from "vuex";
 // import { toDate } from "../../api/method";
 
 export default {
   name: "projectAdd",
   setup() {
+    const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const isEdit = ref(false);
@@ -580,23 +582,7 @@ export default {
       console.log(`selected ${key}`, classifyList4);
       // systemid = key;
     };
-    //模版滚动加载信息
-    const templateScroll = (e) => {
-      // console.log("滚动", e, b);
-      const { target } = e;
-      const scrllHeight = target.scrollHeight - target.scrollTop;
-      const clientHeight = target.clientHeight;
-      // console.log("scrllHeight", scrllHeight, clientHeight);
-      if (scrllHeight === 0 && clientHeight === 0) {
-        state.currentPage = 1;
-      } else if (scrllHeight - clientHeight == 0) {
-        // 下拉到底部时
-        if (state.currentPage < state.totalPages) {
-          // 如果滑到底部，则加载下一页
-          state.currentPage++;
-        }
-      }
-    };
+
 
     // const removeFile = (file) => {
     //   const index = fileList1.value.indexOf(file);
@@ -619,6 +605,9 @@ export default {
     //   attach = attachStr;
     // };
 
+    onMounted(() => {
+    })
+
     const errorMsgs = {
       name: "请输入模板名称",
       category: "请选择模板分类",
@@ -646,11 +635,11 @@ export default {
           "sourceBelongId": state.projectInfo.sourceBelongId,
           "level": state.projectInfo.level,
           "systemId": state.projectInfo.systemId,
-          "boeFlag": state.projectInfo.boeFlag,
-          "courseSyncFlag": state.projectInfo.courseSyncFlag,
+          "boeFlag": state.projectInfo.boeFlag ? 1:0,
+          "courseSyncFlag": state.projectInfo.courseSyncFlag? 1:0,
           "notice": "",
           "noticeFlag": 0,
-          "projectTemplateId": 0,
+          "projectTemplateId": store.state.projectTemplateId,
           "remark": "",
           "status": 0,
           
@@ -667,25 +656,7 @@ export default {
           }
         }
         api
-          .templateEdit({
-          "beginTime": 0,
-          "boeFlag": 0,
-          "category": 0,
-          "courseSyncFlag": 0,
-          "endTime": 0,
-          "level": 0,
-          "manager": "",
-          "managerId": "",
-          "name": "",
-          "notice": "",
-          "noticeFlag": 0,
-          "picUrl": "",
-          "projectTemplateId": 0,
-          "remark": "",
-          "sourceBelongId": 0,
-          "status": 0,
-          "systemId": 0
-        })
+          .templateEdit(obj)
           .then((res) => {
             console.log(res);
             if (res.status == 200 && res.data.code == 200) {
@@ -708,35 +679,6 @@ export default {
           });
       
     };
-        // 编辑项目模板
-      const editTemplate = () => {
-        let obj = {
-        "beginTime": state.projectInfo.time,
-        "boeFlag": state.projectInfo.boeFlag,
-        "category": 0,
-        "courseSyncFlag": state.projectInfo.courseSyncFlag,
-        "endTime": state.projectInfo.time,
-        "level": state.projectInfo.level,
-        "manager": state.projectInfo.manager,
-        "managerId": "",
-        "name": state.projectInfo.name,
-        "notice": "",
-        "noticeFlag": 0,
-        "picUrl": "",
-        "projectTemplateId": 0,
-        "remark": state.projectInfo.remark,
-        "sourceBelongId": state.projectInfo.sourceBelongId,
-        "status": 0,
-        "systemId": state.projectInfo.systemId
-      };
-      api.templateEdit(obj).methods(obj).then(res => {
-        message.success("编辑成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("编辑失败"+err)
-        console.log(err)
-      })
-    }
 
     return {
       ...toRefs(state),
@@ -766,8 +708,6 @@ export default {
       isEdit,
       backPage,
       dateFormatList,
-      editTemplate,
-      templateScroll,
     };
   },
 };