feat:合并

src/components/drawers/AddOnline.vue

@@ -59,10 +59,10 @@
           <div class="mntc_left">
             <div class="notice_icon"></div>
             <span style="color: rgba(0, 0, 0, 0.65); margin-right: 17px"
-              >已选择 <span style="color: #388be1">4</span> 项</span
+              >已选择 <span style="color: #388be1">{{RowsNum}}</span> 项</span
             >
             <span style="color: rgba(0, 0, 0, 0.65)"
-              >列表选项总计：<span>14</span> 条</span
+              >列表选项总计：<span>{{tableDataTotal}}</span> 条</span
             >
           </div>
           <div class="mntc_right">
@@ -169,7 +169,8 @@ export default {
       time: undefined,
       assessmentId:null,
       assessmentName:"",
-      tableData: [ ],
+      RowsNum: 0,
+      tableData: [],
       currentPage: 1,
       tableDataTotal: 0,
       pageSize: 10,
@@ -183,7 +184,7 @@ export default {
     };
     const tableDataFunc = () => {
       const columns = [
-      {
+        {
           title: "课程编号",
           dataIndex: "num",
           key: "num",
@@ -230,10 +231,24 @@ export default {
       return columns;
     };
     const rowSelection = {
+      checkStrictly: false,
+      onSelectAll: (selected) => {
+        console.log(selected);
+        if (selected == true) {
+          state.RowsNum = state.tableDataTotal
+        } else {
+          state.RowsNum = 0
+        }
+      },
       onSelect: (selectedRows, selected, selectedRowKeys) => {
         console.log(
           "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
         console.log(selectedRows.assessmentId);
+        if (selected == true) {
+          state.RowsNum++
+        } else {
+          state.RowsNum--
+        }
         state.assessmentId = selectedRows.assessmentId;
         state.assessmentName = selectedRows.name;
       },

src/components/drawers/CreVote.vue

@@ -239,9 +239,10 @@ export default {
       }
       // for (let i = 0; i < state.questions.length; i++) {
       //   for (let k = 0; k < state.questions[i].options.length; k++) {
-      //     // console.log('1111111111111111', state.questions);
+      //     console.log('1111111111111111', state.questions);
-      //     // console.log('2222222222222222', state.questions[i].options);
+      //     console.log('2222222222222222', state.questions[i]);
-
+      //     console.log(' state.questions[i].inputV', state.questions[i].inputV,);
+      //     console.log('state.questions[i].options[k].opvalue',state.questions[i].options[k].opvalue)
       //   }
       // }
       let obj = {

src/components/drawers/FaceManage.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【面授】管理</div>
+        <div class="headerTitle">【{{title}}】管理</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -70,6 +70,9 @@
             <div class="img2"></div>
             <div class="wz">导出数据</div>
           </div>
+          <div class="btn btn2">
+            <div class="wz">导出作业</div>
+          </div>
         </div>
         <div class="line">
           <div class="inline">
@@ -162,6 +165,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    title: {
+      type: String,
+      default: "",
+    },
     projectTaskId: {
       type: Number,
       default: null,
@@ -199,16 +206,7 @@ export default {
           label: "已完成",
         },
       ],
-      tabledata: [
+      tabledata: [],
-        // {
-        //   key: 1,
-        //   name: "哈哈",
-        //   bum: "产品部",
-        //   gangw: "产品经理",
-        //   score: "-",
-        //   state: "未完成",
-        // },
-      ],
       tablecolumns: [
         {
           title: "姓名",
@@ -250,8 +248,53 @@ export default {
           align: "center",
           className: "h",
         },
+        {
+          title: "操作",
+          dataIndex: "operation",
+          key: "operation",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
       ],
     });
+    //面授直播管理列表操作
+    const ListOpera = () => {
+      let arr = state.tabledata;
+      console.log(arr,'-=-=-=-=-=-=-=-=--=-==----=-=-=-');
+      arr.map((value) => {
+        value.operation = (
+          <div
+            style={{
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center",
+            }}
+          >
+            <div
+              class="studentopea1"
+              onClick={() => {
+                console.log('---------')
+              }}
+            >  
+              查看作业
+            </div>
+
+            <div
+              class="studentopea2"
+              onClick={() => {
+                console.log( "--------");
+              }}
+            >
+              查看答卷
+            </div>
+          </div>
+        );
+      });
+      state.tabledata = arr;
+      console.log(state.tabledata,'++++++++++++-------------+++++++++-----------+++++++++++++++');
+    };
+    ListOpera();
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       state.projectName = value;
@@ -362,7 +405,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-      //  getManageList();
+       getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;
@@ -379,6 +422,7 @@ export default {
       onSelectChange,
       showModal,
       closeModal,
+      ListOpera, //渲染列表操作
       showEntryScore,
       showdoneModal,
       closedoneModal,

src/components/drawers/TimeManage.vue

@@ -219,10 +219,6 @@ export default {
     const onChange = (pageNumber) => {
       console.log("Page: ", pageNumber);
     };
-
-    // watch(props.visible, ()=>{
-    //   getManageList()
-    // },{immediate:true});
     //获取任务管理列表
     const getManageList = () => {
       let obj = {
@@ -237,7 +233,6 @@ export default {
       api
         .taskStudentList(obj)
         .then((res) => {
-          console.log("csscas成功");
           state.pageNo = res.data.data.pageNo;
           state.pageSize = res.data.data.pageSize;
           state.pageSize = res.data.data.pageSize;
@@ -291,7 +286,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-      //  getManageList();
+        getManageList();
       }, 500);
       timer = setInterval(() => {
         state.open = false;

src/components/drawers/WorkManage.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【作业】管理</div>
+        <div class="headerTitle">【{{title}}】管理</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -65,6 +65,9 @@
           <div class="btn btn2" @click="showModal">
             <div class="wz">导出作业</div>
           </div>
+          <div class="btn btn2" @click="showModal">
+            <div class="wz">导入成绩</div>
+          </div>
         </div>
         <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
           <a-table
@@ -139,6 +142,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    title: {
+      type: String,
+      default: "",
+    },
     projectTaskId: {
       type: Number,
       default: null,
@@ -312,7 +319,7 @@ export default {
 
     onMounted(() => {
       setTimeout(() => {
-       // getManageList();
+       getManageList();
       }, 1000);
     });
     return {

src/views/learningpath/LevelAddDetail.vue

@@ -107,7 +107,6 @@
             <div class="items2">
               <div class="nname">{{ item.name }}</div>
             </div>
-           
           </div> -->
         </div>
       </div>
@@ -206,12 +205,19 @@
       </div>
       <div class="mid">
         <div class="item">
-          <div class="itcon">
+          <div class="itcon" @click="showDrawerAddOnline()">
             <div class="img">
               <img src="../../assets/images/leveladd/zai.png" />
             </div>
             <div class="text">在线</div>
           </div>
+          <!-- 添加在线侧弹窗 -->
+          <div>
+            <add-online v-model:addonlineVisible="addonlinevisible" @changeData="updateTableData" v-model:edit="edit"
+              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+              v-model:EditOnlineId="EditOnlineId" />
+          </div>
+          <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -224,12 +230,19 @@
           <div class="lin"></div>
         </div>
         <div class="item">
-          <div class="itcon">
+          <div class="itcon" @click="showDrawerAddCase()">
             <div class="img">
               <img src="../../assets/images/leveladd/an.png" />
             </div>
             <div class="text">案例</div>
           </div>
+          <!-- 添加案例侧弹窗 -->
+          <div>
+              <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
+                v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+                v-model:EditCaseId="EditCaseId" />
+            </div>
+            <!-- 添加案例侧弹窗 -->
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -953,6 +966,8 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
+import AddOnline from "../../components/drawers/AddOnline.vue"
+import AddCase from "../../components/drawers/AddCase.vue"
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
@@ -969,12 +984,17 @@ import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
 import { editTask } from "../../api/indexTaskadd";
+import * as apiProj from "../../api/indexInvist.js";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
 import { toDate } from "../../api/method";
 export default {
   name: "LevelAddDetail",
   components: {
     AddStu,
     ImpStu,
+    AddOnline,
+    AddCase,
     AddHomework,
     AddDiscuss,
     AddActive,
@@ -1087,104 +1107,108 @@ export default {
           time: "2022-07-15 14:00",
         },
       ],
-      drawertableData: [
+      drawertableData: [],
-        {
+      // drawertableData: [
-          key: 1,
+      //   {
-          projectName: "管理者进阶",
+      //     key: 1,
-          manager: "黄华  刘俊",
+      //     projectName: "管理者进阶",
-          creater: "毛继禹",
+      //     manager: "黄华  刘俊",
-          time: "2022-07-20 14:00:03",
+      //     creater: "毛继禹",
-          children: [
+      //     time: "2022-07-20 14:00:03",
-            {
+      //     children: [
-              key: "1-1",
+      //       {
-              projectName: "管理者进阶-腾飞班",
+      //         key: "1-1",
-              manager: "黄华  刘俊",
+      //         projectName: "管理者进阶-腾飞班",
-              creater: "毛继禹",
+      //         manager: "黄华  刘俊",
-              time: "2022-07-20 14:00:03",
+      //         creater: "毛继禹",
-              children: [
+      //         time: "2022-07-20 14:00:03",
-                {
+      //         children: [
-                  key: "1-1-1",
+      //           {
-                  projectName: "管理者进阶-腾飞班K1",
+      //             key: "1-1-1",
-                  manager: "黄华  刘俊",
+      //             projectName: "管理者进阶-腾飞班K1",
-                  creater: "毛继禹",
+      //             manager: "黄华  刘俊",
-                  time: "2022-07-20 14:00:03",
+      //             creater: "毛继禹",
-                },
+      //             time: "2022-07-20 14:00:03",
-              ],
+      //           },
-            },
+      //         ],
-          ],
+      //       },
-        },
+      //     ],
-        {
+      //   },
-          key: 2,
+      //   {
-          projectName: "管理者进阶",
+      //     key: 2,
-          manager: "黄华  刘俊",
+      //     projectName: "管理者进阶",
-          creater: "毛继禹",
+      //     manager: "黄华  刘俊",
-          time: "2022-07-20 14:00:03",
+      //     creater: "毛继禹",
-          children: [
+      //     time: "2022-07-20 14:00:03",
-            {
+      //     children: [
-              key: "2-1",
+      //       {
-              projectName: "管理者进阶-腾飞班",
+      //         key: "2-1",
-              manager: "黄华  刘俊",
+      //         projectName: "管理者进阶-腾飞班",
+      //         manager: "黄华  刘俊",
 
-              creater: "毛继禹",
+      //         creater: "毛继禹",
-              time: "2022-07-20 14:00:03",
+      //         time: "2022-07-20 14:00:03",
-              children: [
+      //         children: [
-                {
+      //           {
-                  key: "2-1-1",
+      //             key: "2-1-1",
-                  projectName: "管理者进阶-腾飞班K1",
+      //             projectName: "管理者进阶-腾飞班K1",
-                  manager: "黄华  刘俊",
+      //             manager: "黄华  刘俊",
-                  creater: "毛继禹",
+      //             creater: "毛继禹",
-                  time: "2022-07-20 14:00:03",
+      //             time: "2022-07-20 14:00:03",
-                },
+      //           },
-              ],
+      //         ],
-            },
+      //       },
-          ],
+      //     ],
-        },
+      //   },
 
-        {
+      //   {
-          key: 3,
+      //     key: 3,
-          projectName: "管理者进阶-腾飞班K1",
+      //     projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
+      //     creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
+      //     time: "2022-07-20 14:00:03",
-        },
+      //   },
-        {
+      //   {
-          key: 4,
+      //     key: 4,
-          projectName: "管理者进阶-腾飞班K1",
+      //     projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
+      //     creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
+      //     time: "2022-07-20 14:00:03",
-        },
+      //   },
-        {
+      //   {
-          key: 5,
+      //     key: 5,
-          projectName: "管理者进阶-腾飞班K1",
+      //     projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
+      //     creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
+      //     time: "2022-07-20 14:00:03",
-        },
+      //   },
-        {
+      //   {
-          key: 6,
+      //     key: 6,
-          projectName: "管理者进阶-腾飞班K1",
+      //     projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
+      //     creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
+      //     time: "2022-07-20 14:00:03",
-        },
+      //   },
-        {
+      //   {
-          key: 7,
+      //     key: 7,
-          projectName: "管理者进阶-腾飞班K1",
+      //     projectName: "管理者进阶-腾飞班K1",
-          manager: "黄华  刘俊",
+      //     manager: "黄华  刘俊",
 
-          creater: "毛继禹",
+      //     creater: "毛继禹",
-          time: "2022-07-20 14:00:03",
+      //     time: "2022-07-20 14:00:03",
-        },
+      //   },
-      ],
+      // ],
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       pageSize: 10,
       visible: false,
+      //项目
+      editproj: false,
+      addprojvisible: false,
       AddSvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
       addlivevisible: false, //添加直播抽屉
@@ -1197,7 +1221,9 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
-      EditWorkId: "", // 要编辑的 workid
+      EditOnlineId:"", // 要编辑的 workid
+      EditCaseId:"",
+      EditWorkId: "",
       EditTestId: "",
       EditRefId: "",
       EditLiveId: "",
@@ -1206,6 +1232,8 @@ export default {
       EditEvalId: "",
       EditInvistId: "",
       EditVoteId: "",
+      //项目
+      EditProjId: "",
       routerTaskId: "",
       chapterId: "",
       stageId: "",
@@ -1221,6 +1249,8 @@ export default {
       adddiscussvisible: false, //讨论抽屉
       isStudiscuss: false,
       addactivevisible: false, //活动抽屉
+      addonlinevisible:false,
+      addcasevisible:false,
       addhomeworkvisible: false,
       addtestvisible: false,
       addevalvisible: false,
@@ -1235,6 +1265,13 @@ export default {
       styTitle: null,
       creTime: null,
       picUrl: null,
+      //项目抽屉参数
+      time: undefined,
+      assessmentId: null,
+      assessmentName: "",
+      projectId: null,
+      projectTaskId: null,
+      chooseStageId: null,
     });
 
     //新建关卡
@@ -1285,6 +1322,23 @@ export default {
     const showDrawer = () => {
       state.visible = true;
     };
+    //关闭项目抽屉
+    const leaveProjDrawer = () => {
+      state.addprojvisible = false;
+      state.isLevel = false;
+    };
+    //在线抽屉
+    const showDrawerAddOnline = (id,eleId)=>{
+      state.addonlinevisible = true;
+      state.EditWorkId = id;
+      state.routerTaskId = eleId;
+    }
+    //案例抽屉
+    const showDrawerAddCase = (id,eleId)=>{
+      state.addcasevisible = true;
+      state.EditWorkId = id;
+      state.routerTaskId = eleId;
+    }
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
       console.log("homework==============", id, state.isactive);
@@ -1337,6 +1391,12 @@ export default {
       state.EditActiveId = id;
       state.routerTaskId = eleId;
     };
+    //打开项目抽屉
+    const showDrawerAddProj = (id, eleId) => {
+      state.addprojvisible = true;
+      state.EditActiveId = id;
+      state.routerTaskId = eleId;
+    };
 
     // tableData数据赋值方法
     const dataAssignment = (id) => {
@@ -1525,23 +1585,11 @@ export default {
     };
 
     const drawertableColumns = () => {
-      // let arr = state.drawertableData;
-      // function traverse(arr) {
-      //   for (var a in arr) {
-      //     // console.log(arr[a]);
-      //     if (arr[a].children) {
-      //       traverse(arr[a].children); //递归遍历
-      //     } else {
-      // 			console.log(arr[a].children); //如果是值就显示
-
-      //     }
-      //   }
-      // }
-      // traverse(arr);
       const drawercolumns = [
         {
           title: "项目名称",
-          dataIndex: "projectName",
+          dataIndex: "name",
+          // dataIndex: "projectName",
           key: "projectName",
           width: 200,
           // align: "center",
@@ -1584,7 +1632,7 @@ export default {
 
         {
           title: "创建人",
-          dataIndex: "creater",
+          dataIndex: "creator",
           // width: "30%",
           key: "creater",
           width: 100,
@@ -1614,6 +1662,7 @@ export default {
         "rgb(245, 247, 250,1)";
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
       getDetail();
+      getAllProjText();
     });
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
@@ -1792,6 +1841,12 @@ export default {
         showDrawerAddEval(id, eleId);
       } else if (type == "投票") {
         showDrawerAddVote(id, eleId);
+      } else if (type == "项目") {
+        showDrawerAddProj(id, eleId);
+      } else if (type == "在线") {
+        showDrawerAddOnline(id, eleId);
+      } else if (type == "案例") {
+        showDrawerAddCase(id, eleId);
       }
     };
     //删除关卡
@@ -1850,6 +1905,78 @@ export default {
       console.log("阶段改变", value, option);
       state.removeStageId = option.chapterId;
     };
+
+    //项目抽屉用的
+    const rowSelection = {
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+        console.log(selectedRows.assessmentId);
+        state.assessmentId = selectedRows.assessmentId;
+        state.assessmentName = selectedRows.name;
+      },
+    };
+    const getTableDate = (drawertableData) => {
+      let data = drawertableData;
+      let array = [];
+      data.map((value, index) => {
+        let obj = {
+          key: index,
+          assessmentId: value.assessmentId,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+        };
+        array.push(obj);
+      });
+      state.drawertableData = array;
+    };
+    //获取全部项目信息接口
+    const getAllProjText = () => {
+      apiProj
+        .queryAssessmentDetailList({
+          assessmentName: "",
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
+        })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            getTableDate(arr);
+            console.log('---------------项目信息---------------------------');
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部项目信息接口失败", err);
+          console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
+          // state.createLoading = false;
+        });
+    };
+    const updateTask = () => {
+        RouterEditTask({
+          chapterId: state.isactive,
+          courseId: state.assessmentId,
+          name: state.assessmentName,
+          routerId: state.routerId,
+          routerTaskId: state.routerTaskId || 0,
+          type: 13,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${state.editproj ? '编辑' : '新增'}关卡任务成功`)
+            // ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+    }
+    onMounted(() => {
+      // createCase();
+      getAllProjText();
+    });
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1871,6 +1998,8 @@ export default {
       drawertableColumns,
       editChapter,
       // updateChapter,
+      showDrawerAddOnline,
+      showDrawerAddCase,
       showDrawerAddHomework,
       showDrawerAddTest,
       showDrawerAddEval,
@@ -1879,6 +2008,8 @@ export default {
       deleteLevelTask,
       showDrawerAddLive,
       showDrawerAddRef,
+      showDrawerAddProj,
+      leaveProjDrawer,
       closeDeleteModel,
       clearEditData,
       showDrawerAddDiscuss,
@@ -1895,6 +2026,10 @@ export default {
       showChangeModal,
       closeChangeModal,
       handleChangeStage,
+      rowSelection,
+      getTableDate,
+      getAllProjText,
+      updateTask,
     };
   },
 };

src/views/projectcenter/TaskPage.vue

@@ -421,6 +421,7 @@
                         style="cursor: pointer"
                         @click="showCodeModal"
                       >
+                      <!-- 我的@click=" showCopyModal(item.type)" -->
                         二维码
                       </div>
                       <div
@@ -431,17 +432,15 @@
                           item.type == '3' ||
                           item.type == '7' ||
                           item.type == '8' ||
-                          item.type == '6' ||
+                          item.type == '9' ||
-                          item.type == '11' ||
+                          item.type == '11'
-                          item.type == '12' ||
-                          item.type == '9'
                             ? showTime(item.name, item.projectTaskId)
                             : item.type == '5' || item.type == '10'
                             ? showTest(item.name, item.projectTaskId)
-                            : item.type == '2'
+                            : item.type == '2' || item.type == '6'
-                            ? showFace(item.projectTaskId)
+                            ? showFace(item.name,item.projectTaskId)
                             : item.type == '4'
-                            ? showWork(item.projectTaskId)
+                            ? showWork(item.name,item.projectTaskId)
                             : null
                         "
                       >
@@ -1031,6 +1030,7 @@
       v-model:Fvisible.sync="FaceVisivle"
       v-if="FaceVisivle"
       :projectTaskId="projectTaskId"
+      :title="showFaceText"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
     <subset-manage v-model:Svisible="subsetVisivle" />
@@ -1064,62 +1064,36 @@
       v-model:Wvisible.sync="Wvisible"
       v-if="Wvisible"
       :projectTaskId="projectTaskId"
+      :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
-    <test-manage
+    <test-manage v-model:TMvisible.sync="TMvisible" v-if="TMvisible" :title="showTestText" :projectTaskId="projectTaskId" />
-      v-model:TMvisible.sync="TMvisible"
-      v-if="Wvisible"
-      :title="showTestText"
-      :projectTaskId="projectTaskId"
-    />
     <!-- 批量面授报名 -->
     <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
     
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
-      <a-modal
+      <a-modal v-model:visible="pubproject" :title="null" @ok="closeModal" :footer="null" :closable="false" :centered="true"
-        v-model:visible="pubproject"
+        wrapClassName="pubproject" width="679px" height="437px">
-        :title="null"
+        <div class="modalHeader" style="
-        @ok="closeModal"
+          width: 100%;
-        :footer="null"
+          height: 68px;
-        :closable="false"
+          display: flex;
-        :centered="true"
+          align-items: center;
-        wrapClassName="pubproject"
+          justify-content: space-between;
-        width="679px"
+        ">
-        height="437px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
           <div class="headerLeft" style="margin-left: 32px">
-            <span style="width: 15px; height: 15px"
+            <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
-              ><img src="../../assets/images/taskpage/pub.png"
+            <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">项目发布</span>
-            /></span>
-            <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-              >项目发布</span
-            >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-            <img
+            <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
           </div>
         </div>
         <div class="modalMain">
           <div class="projectname">管理者进阶-腾飞班1</div>
           <div class="projecttime">
-            <span class="timeti">项目时间：</span
+            <span class="timeti">项目时间：</span><span class="timeme">2022/08/01-2022/08/30</span>
-            ><span class="timeme">2022/08/01-2022/08/30</span>
           </div>
           <div class="projectbox">
             <div class="promessage">
@@ -1136,12 +1110,8 @@
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
-            <a-checkbox v-model:checked="checked1"
+            <a-checkbox v-model:checked="checked1"><span class="sendpeo">发给老师</span></a-checkbox>
-              ><span class="sendpeo">发给老师</span></a-checkbox
+            <a-checkbox v-model:checked="checked2"><span class="sendpeo">发给学员</span></a-checkbox>
-            >
-            <a-checkbox v-model:checked="checked2"
-              ><span class="sendpeo">发给学员</span></a-checkbox
-            >
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal">取消</a-button>
@@ -1149,229 +1119,181 @@
           </div>
         </div>
       </a-modal>
-    </div>
+      </div>
-    <!-- 概览（无数据）-项目发布弹窗 -->
+      <!-- 概览（无数据）-项目发布弹窗 -->
-    <!-- 学员-创建小组弹窗 -->
+      <!-- 学员-创建小组弹窗 -->
-    <div>
+      <div>
-      <a-modal
+        <a-modal v-model:visible="stugroup" :title="null" @ok="closeModal2" :footer="null" :closable="false" :centered="true"
-        v-model:visible="stugroup"
+          wrapClassName="doublepro" width="624px" height="332px">
-        :title="null"
+          <div class="modalHeader" style="
-        @ok="closeModal2"
-        :footer="null"
-        :closable="false"
-        :centered="true"
-        wrapClassName="doublepro"
-        width="624px"
-        height="332px"
-      >
-        <div
-          class="modalHeader"
-          style="
             width: 100%;
             height: 68px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-          "
+          ">
-        >
+            <div class="headerLeft" style="margin-left: 32px">
-          <div class="headerLeft" style="margin-left: 32px">
+              <span class="headerLeftText" style="font-size: 16px">创建小组</span>
-            <span class="headerLeftText" style="font-size: 16px">创建小组</span>
-          </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
             </div>
-            <div class="inname">小组名称:</div>
+            <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-            <div class="in">
+              <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-              <a-input
-                v-model:value="valueaddg"
-                placeholder="请输入小组名称"
-                style="border-radius: 8px; height: 40px"
-              />
             </div>
           </div>
-          <div class="name">
+          <div class="modalMain">
-            <div class="star" style="margin-top: -4px">
+            <div class="name">
-              <img
+              <div class="star" style="margin-top: -4px">
-                style="width: 10px; height: 10px; margin-left: 15px"
+                <img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">小组长:</div>
-            <div class="in">
-              <a-input
-                v-model:value="valueaddm"
-                placeholder="请输入小组长"
-                style="border-radius: 8px; height: 40px"
-              />
-            </div>
-          </div>
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="createG">确定</a-button>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 学员-创建小组弹窗 -->
-    <!-- 取消学员弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="canclestu"
-        :footer="null"
-        :closable="close"
-        wrapClassName="canclestu"
-        centered="true"
-        @cancel="closeModal1"
-      >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您是否授予此学员优秀学员称号？</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="cancelyou">取消</div>
               </div>
-              <div class="del_btn btn2">
+              <div class="inname">小组名称:</div>
-                <div class="btnText" @click="closeModal1">确定</div>
+              <div class="in">
+                <a-input v-model:value="valueaddg" placeholder="请输入小组名称" style="border-radius: 8px; height: 40px" />
+              </div>
+            </div>
+            <div class="name">
+              <div class="star" style="margin-top: -4px">
+                <img style="width: 10px; height: 10px; margin-left: 15px" src="../../assets/images/basicinfo/asterisk.png" />
+              </div>
+              <div class="inname">小组长:</div>
+              <div class="in">
+                <a-input v-model:value="valueaddm" placeholder="请输入小组长" style="border-radius: 8px; height: 40px" />
+              </div>
+            </div>
+            <div class="pubtn">
+              <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+              <a-button class="pubtn2" @click="createG">确定</a-button>
+            </div>
+          </div>
+        </a-modal>
+      </div>
+      <!-- 学员-创建小组弹窗 -->
+      <!-- 取消学员弹窗 -->
+      <div>
+        <a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
+          @cancel="closeModal1">
+          <div class="delete">
+            <div class="del_header"></div>
+            <div class="del_main">
+              <div class="header">
+                <div class="icon1"></div>
+                <span>提示</span>
+              </div>
+              <div class="body">
+                <span>您是否授予此学员优秀学员称号？</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="cancelyou">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="closeModal1">确定</div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        </a-modal>
-      </a-modal>
+      </div>
-    </div>
+      <!-- 取消学员弹窗 -->
-    <!-- 取消学员弹窗 -->
+      <!-- 优秀学员弹窗 -->
-    <!-- 优秀学员弹窗 -->
+      <div>
-    <div>
+        <a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-      <a-modal
+          <div class="delete">
-        v-model:visible="canclestu1"
+            <div class="del_header"></div>
-        :footer="null"
+            <div class="del_main">
-        :closable="close"
+              <div class="header">
-        wrapClassName="canclestu1"
+                <div class="icon1"></div>
-        centered="true"
+                <span>提示</span>
-      >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您是否取消此学员优学员称号？</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="cancelcanyou">取消</div>
               </div>
-              <div class="del_btn btn2">
+              <div class="body">
-                <div class="btnText" @click="closeModal3">确定</div>
+                <span>您是否取消此学员优学员称号？</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="cancelcanyou">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="closeModal3">确定</div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        </a-modal>
-      </a-modal>
+      </div>
-    </div>
+      <!-- 取消学员弹窗 -->
-    <!-- 取消学员弹窗 -->
+      <!-- 删除学员弹窗 -->
-    <!-- 删除学员弹窗 -->
+      <div>
-    <div>
+        <a-modal v-model:visible="deleteOneStu" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
-      <a-modal
+          <div class="delete">
-        v-model:visible="deleteOneStu"
+            <div class="del_header"></div>
-        :footer="null"
+            <div class="del_main">
-        :closable="close"
+              <div class="header">
-        wrapClassName="canclestu1"
+                <div class="icon1"></div>
-        centered="true"
+                <span>提示</span>
-      >
-        <div class="delete">
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="icon1"></div>
-              <span>提示</span>
-            </div>
-            <div class="body">
-              <span>您确定要删除此学员吗</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="closeDeleteOne">取消</div>
               </div>
-              <div class="del_btn btn2">
+              <div class="body">
-                <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
+                <span>您确定要删除此学员吗</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="closeDeleteOne">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="closeDeleteOneConfirm">确定</div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        </a-modal>
-      </a-modal>
+      </div>
-    </div>
+      <!-- 删除学员弹窗 -->
-    <!-- 删除学员弹窗 -->
       
-    <!-- 删除弹窗 -->
+      <!-- 删除弹窗 -->
-    <div>
+      <div>
-      <a-modal
+        <a-modal v-model:visible="delete_hs" :footer="null" :closable="closableQR" wrapClassName="DelModal"
-        v-model:visible="delete_hs"
+          style="margin-top: 400px" @cancel="delete_exit">
-        :footer="null"
+          <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
-        :closable="closableQR"
+            <div class="del_header"></div>
-        wrapClassName="DelModal"
+            <div class="del_main">
-        style="margin-top: 400px"
+              <div class="header">
-        @cancel="delete_exit"
+                <div class="del-icon"></div>
-      >
+                <span>提示</span>
-        <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
+                <div class="close_exit" @click="delete_exit"></div>
-          <div class="del_header"></div>
-          <div class="del_main">
-            <div class="header">
-              <div class="del-icon"></div>
-              <span>提示</span>
-              <div class="close_exit" @click="delete_exit"></div>
-            </div>
-            <div class="body">
-              <span>您确定要删除此课程吗</span>
-            </div>
-            <div class="del_btnbox">
-              <div class="del_btn btn1">
-                <div class="btnText" @click="delete_exit">取消</div>
               </div>
-              <div class="del_btn btn2">
+              <div class="body">
-                <div class="btnText" @click="delete_exit">确定</div>
+                <span>您确定要删除此课程吗</span>
+              </div>
+              <div class="del_btnbox">
+                <div class="del_btn btn1">
+                  <div class="btnText" @click="delete_exit">取消</div>
+                </div>
+                <div class="del_btn btn2">
+                  <div class="btnText" @click="delete_exit">确定</div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        </a-modal>
-      </a-modal>
+      </div>
-    </div>
+      <!-- 删除弹窗 -->
-    <!-- 删除弹窗 -->
+      <!-- 管理二维码 -->
-
+      <a-modal v-model:visible="copyModal" :footer="null" :closable="closeCopy" wrapClassName="facemanageModal"
-    <!-- 面授管理二维码 -->
+        centered="true">
-    <a-modal
+        <div class="delete">
-      v-model:visible="copyModal"
+          <div class="del_header"></div>
-      :footer="null"
+          <div class="del_main">
-      :closable="closeCopy"
+            <div class="header">
-      wrapClassName="facemanageModal"
+              <div class="icon"></div>
-      centered="true"
+              <span v-if="QRtype == '1'">在线管理</span>
-    >
+              <span v-if="QRtype == '2'">面授管理</span>
-      <div class="delete">
+              <span v-if="QRtype == '3'">案例管理</span>
-        <div class="del_header"></div>
+              <span v-if="QRtype == '4'">作业管理</span>
-        <div class="del_main">
+              <span v-if="QRtype == '5'">考试管理</span>
-          <div class="header">
+              <span v-if="QRtype == '6'">直播管理</span>
-            <div class="icon"></div>
+              <span v-if="QRtype == '7'">外链管理</span>
-            <span>面授管理</span>
+              <span v-if="QRtype == '8'">讨论管理</span>
+              <span v-if="QRtype == '9'">活动管理</span>
+              <span v-if="QRtype == '10'">测评管理</span>
+              <span v-if="QRtype == '11'">评估管理</span>
+              <span v-if="QRtype == '12'">投票管理</span>
             <div class="close_exit" @click="closeCopyModal"></div>
           </div>
           <div class="body">
@@ -1386,62 +1308,6 @@
         </div>
       </div>
     </a-modal>
-    <!-- 直播管理二维码 -->
-    <a-modal
-      v-model:visible="zhibModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="facemanageModal"
-      centered="true"
-    >
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>直播管理</span>
-            <div class="close_exit" @click="closezhibModal"></div>
-          </div>
-          <div class="body">
-            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
-          </div>
-          <div class="footerr">
-            <div class="onload">下载二维码</div>
-            <div class="onloadpx">200*200</div>
-            <div class="onloadpx">400*400</div>
-            <div class="onloadpx">800*800</div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!-- 活动管理二维码 -->
-    <a-modal
-      v-model:visible="huodModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="facemanageModal"
-      centered="true"
-    >
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>活动管理</span>
-            <div class="close_exit" @click="closehuodModal"></div>
-          </div>
-          <div class="body">
-            <div><img src="../../assets/images/taskpage/erweima.png" /></div>
-          </div>
-          <div class="footerr">
-            <div class="onload">下载二维码</div>
-            <div class="onloadpx">200*200</div>
-            <div class="onloadpx">400*400</div>
-            <div class="onloadpx">800*800</div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
     <!-- 批量删除弹窗 -->
     <div>
       <a-modal
@@ -1657,7 +1523,7 @@ export default {
       copyModal: false, //面授二维码弹窗
       closeCopy: false, //面授二维码关闭图标
       zhibModal: false, //直播二维码弹窗
-
+      QRtype: "", //二维码标题
       huodModal: false, //活动二维码弹窗
       allDelete: false, //批量删除弹窗
 
@@ -2143,13 +2009,18 @@ export default {
       ],
 
       taskSyllabusActive: 0,
-      //在线管理等页面传递参数
+      //在线管理等页面传递参数title
       showTimeText: "",
-      //考试、测评页面传递参数
+      //考试、测评页面传递参数title
       showTestText: "",
+      //直播、面授传递title
+      showFaceText:"",
+      //直播、面授传递title
+      showWorkText:"",
       //直播、活动页面传递参数
       showkaoqinText: "",
 
+
       //排行榜时间
       rankStartTime: null,
       rankEndTime: null,
@@ -2405,8 +2276,33 @@ export default {
         state.stugroup = false;
       }
     };
-    const showCopyModal = () => {
+    const showCopyModal = (itemtype) => {
       state.copyModal = true;
+      if (itemtype == "1") {
+        state.QRtype = "1"
+      } else if (itemtype == "2") {
+        state.QRtype = "2"
+      } else if (itemtype == "3") {
+        state.QRtype = "3"
+      } else if (itemtype == "4") {
+        state.QRtype = "4"
+      } else if (itemtype == "5") {
+        state.QRtype = "5"
+      } else if (itemtype == "6") {
+        state.QRtype = "6"
+      } else if (itemtype == "7") {
+        state.QRtype = "7"
+      } else if (itemtype == "8") {
+        state.QRtype = "8"
+      } else if (itemtype == "9") {
+        state.QRtype = "9"
+      } else if (itemtype == "10") {
+        state.QRtype = "10"
+      } else if (itemtype == "11") {
+        state.QRtype = "11"
+      } else if (itemtype == "12") {
+        state.QRtype = "12"
+      }
     };
     const closeCopyModal = () => {
       state.copyModal = false;
@@ -2422,10 +2318,11 @@ export default {
       state.projectTaskId = id;
     };
     //新增
-    const showFace = (id) => {
+    const showFace = (name, id) => {
       //面授管理的抽屉
       // console.log("点击管理");
       state.FaceVisivle = true;
+      state.showFaceText = name;
       state.projectTaskId = id;
     };
     const showSubset = () => {
@@ -2448,8 +2345,9 @@ export default {
       state.showkaoqinText = "【" + course + "】" + "考勤";
     };
     //作业管理的抽屉
-    const showWork = (id) => {
+    const showWork = (name,id) => {
       state.Wvisible = true;
+      state.showWorkText = name;
       state.projectTaskId = id;
     };
     //考试管理的抽屉