hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 10:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2023-01-05 20:48:30 +08:00
parent d5f34009df 83b46533bf
commit 047e553d7b
3 changed files with 96 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -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<res.data.data.studyDetailList.length;i++){
// 处理在线课字段和表格中字段保持一致
let obj = {
studentUserNo: res.data.data.studyDetailList[i].studentCode,
studentName: res.data.data.studyDetailList[i].studentName,
studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
studentJobName: res.data.data.studyDetailList[i].studentJobName,
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
}
newData.push(obj)
}
state.tabledata = newData;
state.tableDataTotal = res.data.data.total;
}
}).catch(err=>{
console.log(err)
state.tableDataTotalLoading = false;
})
}else{
state.tableDataTotalLoading = false;
state.tabledata = [];
}

31
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -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<res.data.data.studyDetailList.length;i++){
// 处理在线课字段和表格中字段保持一致
let obj = {
studentUserNo: res.data.data.studyDetailList[i].studentCode,
studentName: res.data.data.studyDetailList[i].studentName,
studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
studentJobName: res.data.data.studyDetailList[i].studentJobName,
lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
}
newData.push(obj)
}
state.tabledata = newData;
state.tableDataTotal = res.data.data.total;
}
console.log(obj)
}).catch(err=>{
console.log(err)
state.tableDataTotalLoading = false;

47
src/views/courselibrary/CoursewareManage.vue
View File

@@ -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 = [