From 87db2fab4d3b24b141dcf8c253635f0b0d864358 Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Wed, 16 Nov 2022 13:09:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:taskoage=E6=89=80=E6=9C=89=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E6=95=B4=E7=90=86=E6=88=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=9C=A8=E7=BA=BF=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96=E9=80=89=E9=A1=B9=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=BD=E5=B1=89=E6=8E=A5=E5=8F=A3=E8=BF=98?= =?UTF-8?q?=E6=B2=A1=E8=B0=83=E8=AF=95=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 23 +- src/components/drawers/CreVote.vue | 7 +- src/components/drawers/FaceManage.vue | 6 +- src/components/drawers/TimeManage.vue | 7 +- src/components/drawers/WorkManage.vue | 5 +- src/views/learningpath/LevelAddDetail.vue | 1119 +++++++++++---------- src/views/projectcenter/TaskPage.vue | 543 ++++------ 7 files changed, 808 insertions(+), 902 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 34b6b274..6bdd58aa 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -59,10 +59,10 @@
已选择 4 项已选择 {{RowsNum}} 项 列表选项总计：14 条列表选项总计：{{tableDataTotal}} 条
@@ -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; }, diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index 38298648..5209a904 100644 --- a/src/components/drawers/CreVote.vue +++ b/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('2222222222222222', state.questions[i].options); - + // console.log('1111111111111111', state.questions); + // 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 = { diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 68a3273d..028d1c6c 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -70,6 +70,10 @@
导出数据
+
+
+
导出作业
+
@@ -362,7 +366,7 @@ export default { let timer; onMounted(() => { setTimeout(() => { - // getManageList(); + getManageList(); }, 1000); timer = setInterval(() => { state.open = false; diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue index ef802882..8b8789ef 100644 --- a/src/components/drawers/TimeManage.vue +++ b/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; diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index 0962b1f4..bfb1bea4 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -65,6 +65,9 @@
导出作业
+
+
导入成绩
+
{ setTimeout(() => { - // getManageList(); + getManageList(); }, 1000); }); return { diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index aea37d17..1621d781 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -212,495 +212,378 @@
在线
-
- -
-
-
- -
-
面授
-
-
-
-
-
-
- -
-
案例
-
-
-
-
-
-
- -
-
作业
-
- +
- +
+
-
-
-
-
- -
-
考试
- -
- -
-
-
-
-
-
- -
-
直播
-
-
- -
-
-
-
-
-
- -
-
外链
-
-
- -
-
-
-
-
-
- -
-
讨论
-
-
- -
-
-
-
-
-
- -
-
活动
-
-
- -
-
-
-
-
-
- -
-
测评
- -
- -
- -
-
-
-
-
-
- -
-
评估
- -
- -
- -
-
-
-
-
-
- -
-
投票
- -
- -
- -
-
-
-
-
-
- -
-
项目
-
-
- -
-
-
-
- 任务列表 -
-
-
-
移动到任务阶段
+
+
+
+
-
-
-
批量删除
+
面授
+
+
+
+
+
+
+
+
案例
+
+ +
+ +
+ +
+
+
+
+
+ +
+
作业
+
+ +
+ +
+
+
+
+
+
+ +
+
考试
+
+ +
+ +
+
+
+
+
+
+ +
+
直播
+
+
+ +
+
+
+
+
+
+ +
+
外链
+
+
+ +
+
+
+
+
+
+ +
+
讨论
+
+
+ +
+
+
+
+
+
+ +
+
活动
+
+
+ +
+
+
+
+
+
+ +
+
测评
+ +
+ +
+ +
+
+
+
+
+
+ +
+
评估
+ +
+ +
+ +
+
+
+
+
+
+ +
+
投票
+ +
+ +
+ +
+
+
+
+
+
+ +
+
项目
-
-
-
+
+
+
+ 任务列表 +
+
+
+
移动到任务阶段
+
+
+
+
批量删除
+
+
+
+
+
- - -
类型
-
-
任务名称
-
必修/选修
-
时长
-
- 操作 -
-
- - - -
- -
-
-
-
-
- 无任务 -
-
- 请点击上方，创建任务 +
+
-
-
+
- -
-
-
-
-
-
暂存
-
-
-
确定
-
-
-
下一步
-
-
-
-
- -
-
-
关联项目
- +
+
+
+
暂存
+
+
+
确定
+
+
+
下一步
+
-
- - -
-
- - +
+
+ +
+
+
关联项目
+ +
+
+ + +
+
+ +
@@ -918,6 +801,10 @@ 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 * as apiTask from "../../api/indexTaskadd"; +import { RouterEditTask } from "@/api/indexTask"; +import dayjs from "dayjs"; export default { name: "LevelAddDetail", components: { @@ -1035,104 +922,108 @@ export default { time: "2022-07-15 14:00", }, ], - drawertableData: [ - { - key: 1, - projectName: "管理者进阶", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "1-1", - projectName: "管理者进阶-腾飞班", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "1-1-1", - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], - }, - ], - }, - { - key: 2, - projectName: "管理者进阶", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "2-1", - projectName: "管理者进阶-腾飞班", - manager: "黄华 刘俊", + drawertableData: [], + // drawertableData: [ + // { + // key: 1, + // projectName: "管理者进阶", + // manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // children: [ + // { + // key: "1-1", + // projectName: "管理者进阶-腾飞班", + // manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // children: [ + // { + // key: "1-1-1", + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // ], + // }, + // ], + // }, + // { + // key: 2, + // projectName: "管理者进阶", + // manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // children: [ + // { + // key: "2-1", + // projectName: "管理者进阶-腾飞班", + // manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - children: [ - { - key: "2-1-1", - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], - }, - ], - }, + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // children: [ + // { + // key: "2-1-1", + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // ], + // }, + // ], + // }, - { - key: 3, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", + // { + // key: 3, + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 4, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // { + // key: 4, + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 5, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // { + // key: 5, + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 6, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // { + // key: 6, + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - { - key: 7, - projectName: "管理者进阶-腾飞班K1", - manager: "黄华 刘俊", + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // { + // key: 7, + // projectName: "管理者进阶-腾飞班K1", + // manager: "黄华 刘俊", - creater: "毛继禹", - time: "2022-07-20 14:00:03", - }, - ], + // creater: "毛继禹", + // time: "2022-07-20 14:00:03", + // }, + // ], currentPage: 1, tableDataTotal: 100, pageSize: 10, visible: false, + //项目 + editproj: false, + addprojvisible: false, AddSvisible: false, //添加学员抽屉 AddImpStuvisible: false, //导入学员抽屉 addlivevisible: false, //添加直播抽屉 @@ -1154,6 +1045,8 @@ export default { EditEvalId: "", EditInvistId: "", EditVoteId: "", + //项目 + EditProjId: "", routerTaskId: "", chapterId: "", stageId: "", @@ -1177,6 +1070,14 @@ export default { ListChoosedId: 0, selectRow: [], //选择行 selectAll: 0, //0：未选择，1：全选，2：部分选择 + //项目抽屉参数 + time: undefined, + assessmentId: null, + assessmentName: "", + isLevel: false, + projectId: null, + projectTaskId: null, + chooseStageId: null, }); //新建关卡 @@ -1227,6 +1128,11 @@ export default { const showDrawer = () => { state.visible = true; }; + //关闭项目抽屉 + const leaveProjDrawer = () => { + state.addprojvisible = false; + state.isLevel = false; + }; // 作业和考试的抽屉 const showDrawerAddHomework = (id, eleId) => { console.log("homework==============", id, state.isactive); @@ -1279,6 +1185,13 @@ export default { state.EditActiveId = id; state.routerTaskId = eleId; }; + //打开项目抽屉 + const showDrawerAddProj = (id, eleId) => { + state.addprojvisible = true; + state.isLevel = true; + state.EditActiveId = id; + state.routerTaskId = eleId; + }; // tableData数据赋值方法 const dataAssignment = (id) => { @@ -1713,6 +1626,8 @@ export default { showDrawerAddEval(id, eleId); } else if (type == "投票") { showDrawerAddVote(id, eleId); + } else if (type == "项目") { + showDrawerAddVote(id, eleId); } }; //删除关卡 @@ -1756,6 +1671,98 @@ export default { message.warning("修改失败"); }); }; + + //项目抽屉用的 + 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.tableData = 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); + } + }) + .catch((err) => { + console.log("获取全部在线信息接口失败", err); + // state.createLoading = false; + }); + }; + const updateTask = () => { + console.log("jinlaile=================", state.assessmentName) + if (state.isLevel) { + 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); + }); + } 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(); + getAllProjText(); + }); return { ...toRefs(state), // tableDataFunc, @@ -1785,6 +1792,8 @@ export default { deleteLevelTask, showDrawerAddLive, showDrawerAddRef, + showDrawerAddProj, + leaveProjDrawer, closeDeleteModel, clearEditData, showDrawerAddDiscuss, @@ -1798,6 +1807,10 @@ export default { updateTableData, deleteChapter, changeCourseType, + rowSelection, + getTableDate, + getAllProjText, + updateTask, }; }, }; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 6a7c4608..4da39841 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -419,23 +419,7 @@
二维码
@@ -1082,60 +1066,33 @@ :projectTaskId="projectTaskId" /> - + - +
- -
+ +
- - 项目发布 + + 项目发布
- +
管理者进阶-腾飞班1
- 项目时间：2022/08/01-2022/08/30 + 项目时间：2022/08/01-2022/08/30
@@ -1152,12 +1109,8 @@ 发送项目通知
- 发给老师 - 发给学员 + 发给老师 + 发给学员
取消 @@ -1165,228 +1118,181 @@
-
- - -
- -
-
- 创建小组 -
-
- -
-
-
-
-
- +
+ + +
+ +
+
+ 创建小组
-
小组名称:
-
- +
+
-
-
- +
+
+
+ +
+
小组名称:
+
+ +
-
小组长:
-
- +
+
+ +
+
小组长:
+
+ +
+
+
+ 取消 + 确定
-
- 取消 - 确定 + +
+ + +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否授予此学员优秀学员称号？ +
+
+
+
取消
+
+
+
确定
+
+
+
-
- -
- - -
- + +
+ + +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否取消此学员优学员称号？ +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+ 提示 +
+
+ 您确定要删除此学员吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+ + + +
+ +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此课程吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+ + +
-
- 提示 -
-
- 您是否授予此学员优秀学员称号？ -
-
-
-
取消
-
-
-
确定
-
-
-
-
- -
- - -
- -
-
-
-
-
- 提示 -
-
- 您是否取消此学员优学员称号？ -
-
-
-
取消
-
-
-
确定
-
-
-
-
- -
- - -
- -
-
-
-
-
- 提示 -
-
- 您确定要删除此学员吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- -
- - - -
- -
-
-
-
-
- 提示 -
-
-
- 您确定要删除此课程吗 -
-
-
-
取消
-
-
-
确定
-
-
-
-
- -
- - - -
-
-
-
-
- 面授管理 +
+ 在线管理 + 面授管理 + 案例管理 + 作业管理 + 考试管理 + 直播管理 + 外链管理 + 讨论管理 + 活动管理 + 测评管理 + 评估管理 + 投票管理
@@ -1401,62 +1307,6 @@
- - -
-
-
-
-
- 直播管理 -
-
-
-
-
-
-
下载二维码
-
200*200
-
400*400
-
800*800
-
-
-
- - - -
-
-
-
-
- 活动管理 -
-
-
-
-
-
-
下载二维码
-
200*200
-
400*400
-
800*800
-
-
-
-
{ + 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; From 8a57944e3a3f24324ea5bca602c8f950324c1f83 Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Wed, 16 Nov 2022 19:32:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=A8=E7=BA=BF=20=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=20=20=E9=A1=B9=E7=9B=AE=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=BF=E5=86=99=EF=BC=88=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=89=E9=9D=A2?= =?UTF-8?q?=E6=8E=88=E7=AE=A1=E7=90=86=E6=94=B9=E4=BA=86=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/FaceManage.vue | 64 +++++++++++++--- src/components/drawers/WorkManage.vue | 6 +- src/views/learningpath/LevelAddDetail.vue | 92 +++++++++++------------ src/views/projectcenter/TaskPage.vue | 53 +++++++------ 4 files changed, 129 insertions(+), 86 deletions(-) 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; }; //考试管理的抽屉 From aa317a24398daf3696ed45108477ba3441eb3234 Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Wed, 16 Nov 2022 19:57:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:state=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index b21e5f26..918c39d7 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1269,7 +1269,6 @@ export default { time: undefined, assessmentId: null, assessmentName: "", - isLevel: false, projectId: null, projectTaskId: null, chooseStageId: null,