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 01/10] =?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 02/10] =?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 03/10] =?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 04/10] =?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 05/10] =?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 06/10] =?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 07/10] =?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 08/10] =?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 09/10] =?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 10/10] =?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;