diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 028d1c6c..317856a2 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -8,7 +8,7 @@ >
-
【面授】管理
+
【{{title}}】管理
导出数据
-
导出作业
@@ -166,6 +165,10 @@ export default { type: Boolean, default: false, }, + title: { + type: String, + default: "", + }, projectTaskId: { type: Number, default: null, @@ -203,16 +206,7 @@ export default { label: "已完成", }, ], - tabledata: [ - // { - // key: 1, - // name: "哈哈", - // bum: "产品部", - // gangw: "产品经理", - // score: "-", - // state: "未完成", - // }, - ], + tabledata: [], tablecolumns: [ { title: "姓名", @@ -254,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 = ( +
+
{ + console.log('---------') + }} + > + 查看作业 +
+ +
{ + console.log( "--------"); + }} + > + 查看答卷 +
+
+ ); + }); + state.tabledata = arr; + console.log(state.tabledata,'++++++++++++-------------+++++++++-----------+++++++++++++++'); + }; + ListOpera(); const selectProjectName = (value, index) => { console.log("value", value, index); state.projectName = value; @@ -383,6 +422,7 @@ export default { onSelectChange, showModal, closeModal, + ListOpera, //渲染列表操作 showEntryScore, showdoneModal, closedoneModal, diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index bfb1bea4..a448ac2a 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -8,7 +8,7 @@ >
-
【作业】管理
+
【{{title}}】管理
{{ item.name }}
-
--> @@ -206,7 +205,7 @@
-
+
@@ -231,7 +230,7 @@
-
+
@@ -566,7 +565,7 @@
-
@@ -785,6 +784,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"; @@ -802,7 +803,6 @@ import { deleteStudyTask } from "../../api/indexStudy"; import draggable from "vuedraggable"; import { editTask } from "../../api/indexTaskadd"; import * as apiProj from "../../api/indexInvist.js"; -import * as apiTask from "../../api/indexTaskadd"; import { RouterEditTask } from "@/api/indexTask"; import dayjs from "dayjs"; export default { @@ -810,6 +810,8 @@ export default { components: { AddStu, ImpStu, + AddOnline, + AddCase, AddHomework, AddDiscuss, AddActive, @@ -1018,7 +1020,7 @@ export default { // }, // ], currentPage: 1, - tableDataTotal: 100, + tableDataTotal: 0, pageSize: 10, visible: false, //项目 @@ -1036,7 +1038,9 @@ export default { deleteModal: false, // 删除弹窗 deleteID: "", // 要删除的任务的id editID: "", // 要编辑的任务id - EditWorkId: "", // 要编辑的 workid + EditOnlineId:"", // 要编辑的 workid + EditCaseId:"", + EditWorkId: "", EditTestId: "", EditRefId: "", EditLiveId: "", @@ -1061,6 +1065,8 @@ export default { adddiscussvisible: false, //讨论抽屉 isStudiscuss: false, addactivevisible: false, //活动抽屉 + addonlinevisible:false, + addcasevisible:false, addhomeworkvisible: false, addtestvisible: false, addevalvisible: false, @@ -1133,6 +1139,18 @@ export default { 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); @@ -1188,7 +1206,6 @@ export default { //打开项目抽屉 const showDrawerAddProj = (id, eleId) => { state.addprojvisible = true; - state.isLevel = true; state.EditActiveId = id; state.routerTaskId = eleId; }; @@ -1368,23 +1385,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", @@ -1427,7 +1432,7 @@ export default { { title: "创建人", - dataIndex: "creater", + dataIndex: "creator", // width: "30%", key: "creater", width: 100, @@ -1457,6 +1462,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"; @@ -1627,7 +1633,11 @@ export default { } else if (type == "投票") { showDrawerAddVote(id, eleId); } else if (type == "项目") { - showDrawerAddVote(id, eleId); + showDrawerAddProj(id, eleId); + } else if (type == "在线") { + showDrawerAddOnline(id, eleId); + } else if (type == "案例") { + showDrawerAddCase(id, eleId); } }; //删除关卡 @@ -1696,30 +1706,30 @@ export default { }; array.push(obj); }); - state.tableData = array; + state.drawertableData = array; }; //获取全部项目信息接口 const getAllProjText = () => { apiProj .queryAssessmentDetailList({ assessmentName: "", - // pageNo: state.currentPage, - // pageSize: state.pageSize, + 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("获取全部项目信息接口失败", err); + console.log('+++++++++++++++++++++++++++++++++++++++++++++++'); // state.createLoading = false; }); }; const updateTask = () => { - console.log("jinlaile=================", state.assessmentName) - if (state.isLevel) { RouterEditTask({ chapterId: state.isactive, courseId: state.assessmentId, @@ -1738,26 +1748,6 @@ export default { .catch((err) => { console.log(err, 1111); }); - } else { - console.log("=========projectTaskId", state.projectTaskId); - apiTask - .addTask({ - courseId: state.assessmentId, - name: state.assessmentName, - projectId: state.projectId, - projectTaskId: state.projectTaskId || 0, - stageId: state.chooseStageId, - type: 13, - }) - .then((res) => { - console.log("调用项目添加接口后111", res.data, 11111); - // ctx.emit("changeData", false); - closeDrawer(); - }) - .catch((err) => { - console.log(err, 111111); - }); - } } onMounted(() => { // createCase(); @@ -1784,6 +1774,8 @@ export default { drawertableColumns, editChapter, // updateChapter, + showDrawerAddOnline, + showDrawerAddCase, showDrawerAddHomework, showDrawerAddTest, showDrawerAddEval, diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 4da39841..b8cb21c0 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -431,17 +431,15 @@ item.type == '3' || item.type == '7' || item.type == '8' || - item.type == '6' || - item.type == '11' || - item.type == '12' || - item.type == '9' + item.type == '9' || + item.type == '11' ? showTime(item.name, item.projectTaskId) : item.type == '5' || item.type == '10' ? showTest(item.name, item.projectTaskId) - : item.type == '2' - ? showFace(item.projectTaskId) + : item.type == '2' || item.type == '6' + ? showFace(item.name,item.projectTaskId) : item.type == '4' - ? showWork(item.projectTaskId) + ? showWork(item.name,item.projectTaskId) : null " > @@ -1031,6 +1029,7 @@ v-model:Fvisible.sync="FaceVisivle" v-if="FaceVisivle" :projectTaskId="projectTaskId" + :title="showFaceText" /> @@ -1064,6 +1063,7 @@ v-model:Wvisible.sync="Wvisible" v-if="Wvisible" :projectTaskId="projectTaskId" + :title="showWorkText" /> @@ -1075,12 +1075,12 @@
+ width: 100%; + height: 68px; + display: flex; + align-items: center; + justify-content: space-between; + ">
项目发布 @@ -1125,12 +1125,12 @@
+ width: 100%; + height: 68px; + display: flex; + align-items: center; + justify-content: space-between; + ">
创建小组
@@ -1994,13 +1994,18 @@ export default { ], taskSyllabusActive: 0, - //在线管理等页面传递参数 + //在线管理等页面传递参数title showTimeText: "", - //考试、测评页面传递参数 + //考试、测评页面传递参数title showTestText: "", + //直播、面授传递title + showFaceText:"", + //直播、面授传递title + showWorkText:"", //直播、活动页面传递参数 showkaoqinText: "", + //排行榜时间 rankStartTime: null, rankEndTime: null, @@ -2298,10 +2303,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 = () => { @@ -2324,8 +2330,9 @@ export default { state.showkaoqinText = "【" + course + "】" + "考勤"; }; //作业管理的抽屉 - const showWork = (id) => { + const showWork = (name,id) => { state.Wvisible = true; + state.showWorkText = name; state.projectTaskId = id; }; //考试管理的抽屉