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

Merge remote-tracking branch 'boe/zcwy-zsx0223' into zcwy-zsx0223

Browse Source 
# Conflicts:
#	src/components/drawers/project/ProjectExamManage.vue
This commit is contained in:
zhangsir
2024-06-17 17:43:40 +08:00
parent d9a2e43f22 4be9af686d
commit cce16c0019
80 changed files with 7350 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/ActiveAttendance.vue
View File

@@ -893,7 +893,7 @@ export default {
courseId: Number(props.datasource.courseId),
routerId: Number(props.datasource.routerId),
ids: [value.record.studentId],
taskId: Number(props.datasource.routerTaskId),
taskId: Number(props.datasource.routerTaskId)||Number(props.datasource.id),
taskType: Number(props.datasource.type),
type: 1,
};

2
src/components/drawers/StuAdd.vue
View File

@@ -8,7 +8,7 @@
>
<div class="drawerMain" id="stuadd">
<div class="header">
<div class="headerTitle">添加学员</div>
<div class="headerTitle">添加讲师</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../assets/images/basicinfo/close.png"

9
src/components/drawers/project/ProjectEvalManage.vue
View File

@@ -374,7 +374,7 @@ export default {
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId,
taskId: props.projectTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
@@ -386,7 +386,7 @@ export default {
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId,
taskId: props.projectTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
@@ -430,10 +430,7 @@ export default {
// 导出数据
function exportTaskStu() {
if(!props.datasource.projectTaskId){
props.datasource.projectTaskId = ''
}
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskType=${props.datasource.type}&taskId=${props.projectTaskId}`)
// window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
}

2
src/components/drawers/project/ProjectExamManage.vue
View File

@@ -314,7 +314,7 @@ export default {
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',2:'进行中'}[status] || '未开始'),
customRender: ({record:{status}}) => ({2:'进行中',0:'未开始',1:'已完成'}[status] || '未开始'),
},
{
title: "操作",

7
src/components/drawers/router/RouterEvaluationManage.vue
View File

@@ -428,11 +428,8 @@ export default {
// 导出数据
function exportTaskStu() {
console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
if(!props.datasource.routerTaskId){
props.datasource.routerTaskId = ''
}
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`)
}