From b7b15b587f823b27f3b9331bd916085a56daaca4 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 5 Jan 2023 18:44:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=8F=8A=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectOnlineManage.vue | 45 ++++++++++++++++++- .../drawers/router/RouterCommonManage.vue | 31 +++++++------ 2 files changed, 62 insertions(+), 14 deletions(-) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index ac1239b6..b9de20f0 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -336,7 +336,50 @@ export default { state.tableDataTotalLoading = false; state.tabledata = []; }); - } else { + } else if(props.datasource.type == 1) { + console.log("我是传递的查询参数", { + "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, + "status": state.projectName, + "studentName": state.name, + "targetId":props.datasource.projectId, + "taskId": props.datasource.projectTaskId, + "thirdId": props.datasource.targetId, + "type": 1 + }); + + api.QueryOnlineManagementDetail({ + "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, + "status": state.projectName, + "studentName": state.name, + "targetId":props.datasource.projectId, + "taskId": props.datasource.projectTaskId, + "thirdId": props.datasource.targetId, + "type": 1 + }).then(res=>{ + console.log('在线课数据获取', res) + if(res.data.code==200){ + state.tableDataTotalLoading = false; + let newData = [] + for(let i=0;i{ + console.log(err) + state.tableDataTotalLoading = false; + }) + }else{ state.tableDataTotalLoading = false; state.tabledata = []; } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index d802b806..caa56979 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -350,25 +350,30 @@ export default { "chapterId": props.datasource.chapterId, "status": state.projectName, "studentName": state.name, + "targetId":props.datasource.routerId, "taskId": props.datasource.routerTaskId, "thirdId": props.datasource.targetId, "type": 1 }).then(res=>{ console.log('在线课数据获取', res) - state.tableDataTotalLoading = false; - // 处理在线课字段和表格中字段保持一致 - let obj = { - studentUserNo: 1, - studentName: 1, - studentDepartName: 1, - studentJobName: 1, - lastStudyTime: 1, - status: 1 + if(res.data.code==200){ + state.tableDataTotalLoading = false; + let newData = [] + for(let i=0;i{ console.log(err) state.tableDataTotalLoading = false; From 83b46533bf84c710dc7330990b7dbaa8e3e9476a Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 5 Jan 2023 19:12:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 47 ++++++++++++++------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index c0e9537c..2e5b5c5a 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2549,44 +2549,65 @@ const columns2 = [ title: "姓名", dataIndex: "projectName", key: "projectName", - width: "16%", + width: "12%", align: "center", }, { title: "工号", dataIndex: "numb", key: "numb", - width: "16%", + width: "12%", align: "center", }, { - title: "报名时间", + title: "开课名称", + dataIndex: "cname", + key: "cname", + width: "12%", + align: "center", + }, + { + title: "地点", + dataIndex: "address", + key: "address", + width: "12%", + align: "center", + }, + { + title: "数据来源", + dataIndex: "source", + key: "source", + width: "12%", + align: "center", + }, + { + title: "学习时间", dataIndex: "applytime", key: "applytime", - width: "16%", + width: "12%", align: "center", }, { title: "签到时间", dataIndex: "signtime", key: "signtime", - width: "16%", + width: "12%", align: "center", }, { title: "状态", dataIndex: "status", key: "status", - width: "16%", - align: "center", - }, - { - title: "操作", - dataIndex: "opacation", - key: "opacation", - width: "16%", + width: "12%", align: "center", }, + // { + // title: "操作", + // dataIndex: "opacation", + // key: "opacation", + // width: "14%", + // align: "center", + // }, ]; //管理查看详情 const columns4 = [