Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/learningpath/LevelAddDetail.vue

@@ -216,7 +216,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddDiscuss">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/tao.png" />
@@ -225,7 +225,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddActive">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/huo.png" />
@@ -234,7 +234,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddEval">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/ce.png" />
@@ -252,25 +252,41 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddInvist">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/diao.png" />
             </div>
             <div class="text">评估</div>
+                      <!-- 添加评估侧弹窗 -->
+          <div>
+            <add-invist
+              v-model:addinvistVisible="addinvistvisible"
+              @changeData="updateTableData"
+            />
+          </div>
+          <!-- 添加评估侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/tou.png" />
             </div>
             <div class="text">投票</div>
+                        <!-- 添加投票侧弹窗 -->
+            <div>
+              <add-vote
+                v-model:addvoteVisible="addvotevisible"
+                @changeData="updateTableData"
+              />
+            </div>
+            <!-- 添加投票侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
           <div class="itcon">
             <div class="img">
               <img
@@ -508,6 +524,20 @@
     <add-stu v-model:AddSvisible="AddSvisible" />
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
+    <!-- 添加讨论侧弹窗 -->
+          <div>
+            <add-discuss
+              v-model:adddiscussVisible="adddiscussvisible" v-model:isStudiscuss="isStudiscuss"
+            />
+          </div>
+    <!-- 添加讨论侧弹窗 -->
+    <!-- 添加活动侧弹窗 -->
+          <div>
+            <add-active
+              v-model:addactiveVisible="addactivevisible" v-model:isStudiscuss="isStudiscuss"
+            />
+          </div>
+    <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
     <a-modal
       v-model:visible="deleteAll"
@@ -585,9 +615,11 @@ import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
+import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
+import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
-// import AddInvist from "../../components/drawers/AddInvist.vue";
-// import AddVote from "../../components/drawers/AddVote.vue";
+import AddInvist from "../../components/drawers/AddInvist.vue";
+import AddVote from "../../components/drawers/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
@@ -599,9 +631,12 @@ export default {
     AddStu,
     ImpStu,
     AddHomework,
+    AddDiscuss,
+    AddActive,
     AddTest,
     AddEval,
-
+    AddInvist,
+   AddVote,
     AddLive,
     AddRef,
   },
@@ -822,6 +857,9 @@ export default {
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
+      adddiscussvisible: false, //讨论抽屉
+      isStudiscuss: false,
+      addactivevisible: false, //活动抽屉
       addhomeworkvisible: false,
       addtestvisible: false,
       addevalvisible: false,
@@ -831,7 +869,14 @@ export default {
       // 表示当前触发列表的id,用来发送编辑和删除
       ListChoosedId: 0,
     });
-
+    const showDrawerAddDiscuss = () => {
+      state.adddiscussvisible = true;
+      state.isStudiscuss = true;
+    };
+    const showDrawerAddActive = () => {
+      state.addactivevisible = true;
+      state.isStudiscuss = true;
+    };
     //新建关卡
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
@@ -1054,8 +1099,10 @@ export default {
                   <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;
+                      //state.addhomeworkvisible = true;
                     }}
                   >
                     编辑
@@ -1087,6 +1134,7 @@ export default {
         "直播",
         "外链",
         "讨论",
+        "活动",
         "测评",
         "评估",
         "投票",
@@ -1361,10 +1409,12 @@ export default {
       showDrawerAddInvist,
       showDrawerAddVote,
       deleteLevelTask,
-      showDrawerAddLive,
+       showDrawerAddLive,
       showDrawerAddRef,
       closeDeleteModel,
       clearEditData,
+      showDrawerAddDiscuss,
+      showDrawerAddActive,
     };
   },
 };