合并

src/views/learningpath/LevelAddDetail.vue

@@ -481,11 +481,23 @@
           <div class="item" @click="showDrawerAddProj">
             <div class="itcon">
               <div class="img">
-                <img
-                  src="../../assets/images/leveladd/xiang.png"
-                />
+                <img src="../../assets/images/leveladd/xiang.png" />
               </div>
               <div class="text">项目</div>
+              <div>
+                <add-project
+                  v-model:addprojvisible="addprojvisible"
+                  :isLevel="isLevel"
+                  @changeData="updateTableData"
+                  v-model:isactive="isactive"
+                  v-model:edit="edit"
+                  v-model:routerId="routerId"
+                  v-model:chooseStageId="chooseStageId"
+                  v-model:EditProjectId="EditProjectId"
+                  v-model:routerTaskId="routerTaskId"
+                  v-model:chooseProjectList = "chooseProjectList"
+                />
+              </div>
             </div>
           </div>
         </div>
@@ -707,44 +719,6 @@
             <!-- 无数据样式 -->
           </div>
         </div>
-
-        <div class="draw" style="position: relative">
-          <a-drawer
-            v-model:visible="addprojvisible"
-            class="drawerStyle ProjectDrawer"
-            title="关联项目"
-            placement="right"
-            width="80%"
-            @after-visible-change="afterProjVisibleChange"
-          >
-            <div class="drawerMain">
-              <div class="header">
-                <div class="headerTitle">关联项目</div>
-                <img
-                  style="width: 29px; height: 29px; cursor: pointer"
-                  src="../../assets/images/basicinfo/close.png"
-                  @click="leaveProjDrawer"
-                />
-              </div>
-              <div class="drawerbox">
-                <a-table
-                  :columns="drawertableColumns()"
-                  :data-source="drawertableData"
-                  :row-selection="{selectedRowKeys:selectedProjRowKeys,onChange:onProjSelectChange}"
-                  :loading="tableDataTotal === -1 ? true : false"
-                  :scroll="{ x: 700 }"
-                  @expand="expandTable"
-                  :pagination="false"
-                >
-                </a-table>
-              </div>
-              <div class="btnn">
-                <button @click="leaveProjDrawer" class="btn1">取消</button>
-                <button @click="updateTask" class="btn2">确定</button>
-              </div>
-            </div>
-          </a-drawer>
-        </div>
       </div>
       <div class="right" :style="{ display: gqxy_hs ? 'none' : 'block' }">
         <div class="addhead">
@@ -1055,6 +1029,7 @@ import AddInvist from "../../components/drawers/AddInvist.vue";
 import AddVote from "../../components/vote/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
+import AddProject from "../../components/drawers/AddProject.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
 import * as api from "../../api/indexLevel";
 import { GetRouterDetail } from "../../api/indexTask";
@@ -1063,9 +1038,9 @@ import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
-import * as apiProj from "../../api/index.js";
-import { RouterEditTask } from "@/api/indexTask";
-import dayjs from "dayjs";
+
+// import { RouterEditTask } from "@/api/indexTask";
+
 import { toDate } from "../../api/method";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
@@ -1087,6 +1062,7 @@ export default {
     draggable,
     UnlockMode,
     AddFaceteach,
+    AddProject,
   },
   setup() {
     const state = reactive({
@@ -1225,7 +1201,7 @@ export default {
       EditVoteId: "",
       EditFaceId: "",
       //项目
-      EditProjId: "",
+      EditProjectId: "",
       routerTaskId: "",
       chapterId: "",
       stageId: "",
@@ -1270,6 +1246,7 @@ export default {
       deleteChapterId: null, //删除关卡id
 
       unlockModeVisible: false, //切换模式抽屉
+      chooseProjectList: null, //选择的阶段下的任务列表
     });
 
     const showModal = (element) => {
@@ -1444,7 +1421,7 @@ export default {
     //打开项目抽屉
     const showDrawerAddProj = (id, eleId) => {
       state.addprojvisible = true;
-      state.EditActiveId = id;
+      state.EditProjectId = id;
       state.routerTaskId = eleId;
     };
     //关闭项目抽屉
@@ -1457,6 +1434,11 @@ export default {
       for (let i = 0; i < state.level.length; i++) {
         if (state.level[i].chapterId === id) {
           let array = [];
+          state.chooseProjectList = JSON.stringify(state.level[i].taskList);
+          // console.log(
+          //   "goggoo",
+          //   Object.prototype.toString.call(state.chooseProjectList)
+          // );
           state.level[i].taskList.forEach((element) => {
             let obj = {
               id: element.routerTaskId,
@@ -1516,11 +1498,7 @@ export default {
           message.error(err);
         });
     };
-    const afterProjVisibleChange = (bol) => {
-      if(bol == true){
-        getAllProjText()
-      }
-    };
+
     const showAddStu = () => {
       state.AddSvisible = true;
     };
@@ -1542,6 +1520,7 @@ export default {
         "测评",
         "评估",
         "投票",
+        "项目",
       ];
       return typeRules[index];
     };
@@ -1906,90 +1885,6 @@ export default {
       console.log("阶段改变", value, option);
       state.removeStageId = option.chapterId;
     };
-    //项目抽屉用的
-    const onProjSelectChange = (selectedRowKeys,selectedRows) => {
-      state.selectedProjRowKeys = selectedRowKeys
-      state.projListData = selectedRows
-      console.log(selectedRows,state.projListData);
-    }
-    const getTableDate = (data) => {
-      let array = []
-      data.map((value)=>{
-        if(value.type == 3){
-          let obj = {
-            key: value.projectId,
-            parentId:value.parentId,
-            projectId:value.projectId,
-            name: value.name,
-            manager:value.manager,
-            time: dayjs(value.createTime).format("YYYY-MM-DD"),
-          }
-        array.push(obj)
-        }
-        else {
-          let obj = {
-            key: value.projectId,
-            parentId:value.parentId,
-            name: value.name,
-            manager:value.manager,
-            time: dayjs(value.createTime).format("YYYY-MM-DD"),
-            children: value.subList ? getTableDate(value.subList) : [] ,
-          }
-        array.push(obj)
-        }
-      })
-      return array
-    };
-    //获取全部项目信息接口
-    const getAllProjText = () => {
-      apiProj
-        .getProjectList({
-          "beginTime": 0,
-          "createName": "",
-          "endTime": "",
-          "manager": "",
-          "name": "",
-          "pageNo": 1,
-          "pageSize": 10,
-          "status": 0
-        })
-        .then((res) => {
-          let arr = res.data.data.rows;
-          if (res.status === 200) {
-            state.drawertableData = getTableDate(arr);
-          }
-        })
-        .catch(() => {
-          message.destroy()
-          message.error("获取全部项目信息接口失败")
-        });
-    };
-    //添加关卡项目
-    const updateTask = () => {
-      state.projListData.map((value)=>{
-        console.log('--------',value);
-        RouterEditTask({
-        duration: 0,
-        flag: true,
-        chapterId: Number(state.isactive),
-        courseId: Number(value.projectId),
-        name: value.name,
-        routerId: state.routerId,
-        routerTaskId: state.routerTaskId,
-        type: 13,
-      })
-        .then(() => {
-          message.success(`${state.editproj ? "编辑" : "新增"}关卡任务成功`);
-          // ctx.emit("changeData", false);
-          leaveProjDrawer()
-          state.addLoading = false;
-        })
-        .catch(() => {
-          message.destroy()
-          message.error("添加关卡任务失败")
-        });
-      })
-    };
 
     //显示切换模式抽屉
     const showModeVisible = () => {
@@ -2001,7 +1896,6 @@ export default {
       tableDataFunc2,
       showModal,
       closeModal,
-      afterProjVisibleChange,
       showAddStu,
       showImpStu,
       // drawercolumns,
@@ -2041,10 +1935,7 @@ export default {
       showChangeModal,
       closeChangeModal,
       handleChangeStage,
-      onProjSelectChange,
-      getTableDate,
-      getAllProjText,
-      updateTask,
+
 
       showDeleteChapter,
       closeDeleteChapter,