feat:合并

src/views/learningpath/LevelAddDetail.vue

@@ -175,7 +175,7 @@
           <div>
             <add-homework
               flag="0"
-              routerTaskId="ListChoosedId"
+              :workId="editID"
               v-model:addhomeworkVisible="addhomeworkvisible"
             />
           </div>
@@ -190,7 +190,11 @@
           </div>
           <!-- 添加考试侧弹窗 -->
           <div>
-            <add-test v-model:addtestVisible="addtestvisible" />
+            <add-test
+              :workId="editID"
+              @clearEditData="clearEditData"
+              v-model:addtestVisible="addtestvisible"
+            />
           </div>
           <div class="lin"></div>
         </div>
@@ -230,48 +234,30 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item" @click="showDrawerAddEval">
+        <div class="item">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/ce.png" />
             </div>
             <div class="text">测评</div>
-            <!-- 添加测评侧弹窗 -->
-            <div>
-              <add-eval
-                v-model:addevalVisible="addevalvisible"
-                v-model:edit="edit"
-              />
-            </div>
-            <!-- 添加测评侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item" @click="showDrawerAddInvist">
+        <div class="item">
           <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" />
-            </div>
-            <!-- 添加评估侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item" @click="showDrawerAddVote">
+        <div class="item">
           <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" />
-            </div>
-            <!-- 添加投票侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
@@ -311,6 +297,7 @@
               :loading="tableDataTotal === -1 ? true : false"
               expandRowByClick="true"
               @expand="expandTable"
+              :customRow="handleClickRow"
               :pagination="false"
               :row-selection="{
                 columnWidth: 30,
@@ -545,6 +532,37 @@
     <!-- 添加直播抽屉 -->
     <add-live v-model:addliveVisible="addlivevisible" />
     <add-ref v-model:addrefVisible="addrefvisible" />
+    <!-- 是否确认删除任务弹窗 -->
+    <!-- 确认删除阶段弹窗 -->
+    <a-modal
+      v-model:visible="deleteModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeConfirm"></div>
+          </div>
+          <div class="body">
+            <span>您确定要删除此任务吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="closeConfirm">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="deleteLevelTask">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -574,10 +592,10 @@ export default {
     AddVote,
     AddLive,
     AddRef,
+    AddTest,
   },
   setup() {
     const state = reactive({
-      routerId: localStorage.getItem("routerId"),
       level: [
         {
           chapterId: "1",
@@ -589,6 +607,7 @@ export default {
         {
           key: 1,
           lei: "在线",
+          routerTaskId: 0,
           // state: "已发布",
           creater: "管理者课程",
           // pubtime: "2022-07-20 14:00:03",
@@ -779,18 +798,18 @@ export default {
       stm_hs: false,
       deleteAll: false,
       closeDeleteAll: false,
+      deleteModal: false, // 删除弹窗
+      deleteID: "", // 要删除的任务的id
+      editID: "", // 要编辑的任务id
+      cC: false,
       value1: "",
       value2: "",
       selectedRowKeys: [],
-      edit: false, //是否点击编辑
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
       addhomeworkvisible: false,
       addtestvisible: false,
-      addevalvisible: false,
-      addinvistvisible: false,
-      addvotevisible: false,
       updateChapterID: null, //修改关卡id
       // 表示当前触发列表的id,用来发送编辑和删除
       ListChoosedId: 0,
@@ -853,16 +872,6 @@ export default {
       state.addtestvisible = true;
       state.ListChoosedId = 0;
     };
-    //测试评估投票抽屉
-    const showDrawerAddEval = () => {
-      state.addevalvisible = true;
-    };
-    const showDrawerAddInvist = () => {
-      state.addinvistvisible = true;
-    };
-    const showDrawerAddVote = () => {
-      state.addvotevisible = true;
-    };
 
     // tableData数据赋值方法
     const dataAssignment = () => {
@@ -874,25 +883,19 @@ export default {
           creater: element.name,
           cretime: element.duration,
           checked1: element.flag,
+          routerTaskId: element.routerTaskId,
         };
       });
     };
-
     const getDetail = (index) => {
       GetRouterDetail(92)
         .then((res) => {
           state.level = res.data.data.chapterList;
           console.log(state.level);
           if (index == 0) {
-            //   state.tableData[1] = {
-            //   key: 2,
-            //   lei: "在线",
-            //   creater: "管理者课程",
-            //   cretime: "60",
-            //   checked1: true,
-            // }
             dataAssignment(0);
           }
+          state.deleteModal = false;
         })
         .catch((err) => {
           message.error(err);
@@ -1016,15 +1019,15 @@ export default {
           // width: 100,
           align: "center",
           scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: () => {
+          customRender: (e) => {
             return (
               <div class="opa">
                 <div class="opacation">
                   <span
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                     onClick={() => {
-                      state.edit = true;
+                      state.editID = e.record.routerTaskId;
-                      state.addevalvisible = true;
+                      state.addhomeworkvisible = true;
                     }}
                   >
                     编辑
@@ -1032,7 +1035,7 @@ export default {
                   <span
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
-                      deleteLevelTask();
+                      showDeleteModal(e.record.routerTaskId);
                     }}
                   >
                     删除
@@ -1266,6 +1269,15 @@ export default {
     const delete_exit = () => {
       state.deleteAll = false;
     };
+    const showDeleteModal = (id) => {
+      state.deleteID = id;
+      state.deleteModal = true;
+    };
+    const closeConfirm = () => {
+      state.deleteModal = false;
+      state.deleteID = "";
+      state.editID = "";
+    };
     const deleteLevelTask = () => {
       RouterDeleteTask(state.listChoosedId)
         .then((res) => {
@@ -1283,6 +1295,17 @@ export default {
     const showDrawerAddRef = () => {
       state.addrefvisible = true;
     };
+
+    const closeDeleteModel = () => {
+      state.deleteModal = false;
+      state.deleteID = "";
+    };
+    // 子组件触发的清空 editid 事件
+    const clearEditData = () => {
+      state.editID = "";
+      getDetail(0);
+    };
+
     return {
       ...toRefs(state),
       tableDataFunc,
@@ -1300,23 +1323,134 @@ export default {
       gqxy_hShow,
       showDeleteALLModal,
       delete_exit,
+      closeConfirm,
       drawertableColumns,
       editChapter,
       // updateChapter,
       showDrawerAddHomework,
       showDrawerAddTest,
-      showDrawerAddEval,
-      showDrawerAddInvist,
-      showDrawerAddVote,
       deleteLevelTask,
       showDrawerAddLive,
       showDrawerAddRef,
+      closeDeleteModel,
+      clearEditData,
     };
   },
 };
 </script>
 
 <style lang="scss">
+.ConfirmModal {
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
+    .ant-modal-content {
+      width: 424px !important;
+      height: 258px !important;
+      .ant-modal-body {
+        width: 424px !important;
+        height: 258px !important;
+        padding: 0 !important;
+        .delete {
+          z-index: 999;
+          width: 424px;
+          height: 258px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          border-radius: 4px;
+          // position: absolute;
+          // left: 50%;
+          // top: 10%;
+          // transform: translate(-50%, -50%);
+          .del_header {
+            position: absolute;
+            width: calc(100%);
+            height: 40px;
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+          }
+          .del_main {
+            width: 100%;
+            position: relative;
+            .header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+              .icon {
+                width: 16px;
+                height: 16px;
+                margin-right: 10px;
+                background-image: url(@/assets/images/coursewareManage/QR.png);
+                background-size: 100% 100%;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-direction: column;
+              // background-color: red;
+              position: relative;
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
+                font-weight: 400;
+                color: #666666;
+              }
+            }
+            .del_btnbox {
+              display: flex;
+              margin: 30px auto;
+              justify-content: center;
+              .del_btn {
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                flex-shrink: 0;
+                cursor: pointer;
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 40px;
+                }
+              }
+              .btn1 {
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+                margin-right: 14px;
+              }
+              .btn2 {
+                background-color: #4ea6ff;
+                color: #ffffff;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 .clearfix:after,
 .clearfix:before {
   content: " ";