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

--fix 面授课 与任务分开

Browse Source
This commit is contained in:
yuping
2023-01-16 17:18:32 +08:00
parent 185efb082c
commit f7f245e1c2
6 changed files with 41 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/components/drawers/AddLevelImportStu.vue
View File

@@ -31,35 +31,12 @@
name="uploadFile" name="uploadFile"
:multiple="false" :multiple="false"
@change="handleChange" @change="handleChange"
:data=" :data="{
courseType == 1
? {
targetId: Number(courseId), targetId: Number(courseId),
type: 3, type: courseType,
userId: userInfo.id, userId: userInfo.id,
userName: userInfo.realName, userName: userInfo.realName,
} } "
: courseType == 3
? {
targetId: Number(courseId),
type: 1,
userId: userInfo.id,
userName: userInfo.realName,
}
: courseType == 4
? {
targetId: Number(courseId),
type: 2,
userId: userInfo.id,
userName: userInfo.realName,
}
: {
targetId: Number(courseId),
type: 3,
userId: userInfo.id,
userName: userInfo.realName,
}
"
:showUploadList="false" :showUploadList="false"
> >
<p class="ant-upload-drag-icon"> <p class="ant-upload-drag-icon">

26
src/components/drawers/project/ProjectFaceStu.vue
View File

@@ -186,7 +186,7 @@
v-model:AddImpStuvisible="AddImpStuvisible" v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose" @AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="projectTaskInfo.courseId" :courseId="projectTaskInfo.courseId"
:courseType="2" :courseType="3"
/> />
<!-- 批量签到弹窗 --> <!-- 批量签到弹窗 -->
<a-modal <a-modal
@@ -397,7 +397,7 @@ export default {
ids: state.selectedStudents, ids: state.selectedStudents,
taskId: Number(props.projectTaskInfo.projectTaskId), taskId: Number(props.projectTaskInfo.projectTaskId),
taskType: Number(props.projectTaskInfo.type), taskType: Number(props.projectTaskInfo.type),
type: 1, type: 3,
// userName: "", // userName: "",
}; };
api api
@@ -663,7 +663,7 @@ export default {
studentName: text.record.studentName, studentName: text.record.studentName,
taskId: Number(props.projectTaskInfo.projectTaskId), taskId: Number(props.projectTaskInfo.projectTaskId),
taskType: Number(props.projectTaskInfo.type), taskType: Number(props.projectTaskInfo.type),
type: 1, type: 3,
// userName: "", // userName: "",
}; };
api api
@@ -697,7 +697,7 @@ export default {
studentName: text.record.studentName, studentName: text.record.studentName,
taskId: Number(props.projectTaskInfo.projectTaskId), taskId: Number(props.projectTaskInfo.projectTaskId),
taskType: Number(props.projectTaskInfo.type), taskType: Number(props.projectTaskInfo.type),
type: 1, type: 3,
}; };
api api
.attendanceLeave(obj) .attendanceLeave(obj)
@@ -800,26 +800,26 @@ export default {
console.log("我是传递的查询参数", props.projectTaskInfo, { console.log("我是传递的查询参数", props.projectTaskInfo, {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId, // currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 3,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.courseId,
// status: Number(state.name), // status: Number(state.name),
studentName: state.name, studentName: state.name,
signStatus: state.projectName2, signStatus: state.projectName2,
taskId: props.projectTaskInfo.projectTaskId, // taskId: props.projectTaskInfo.projectTaskId,
}); });
api api
.AssessmentManagementMessage({ .AssessmentManagementMessage({
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 3,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.courseId,
// status: Number(state.name), // status: Number(state.name),
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, // taskId: props.projectTaskInfo.projectTaskId,
signStatus: state.projectName2, signStatus: state.projectName2,
taskType: props.projectTaskInfo.type, // taskType: props.projectTaskInfo.type,
}) })
.then((res) => { .then((res) => {
console.log("获取面授管理学员", res); console.log("获取面授管理学员", res);
@@ -866,7 +866,7 @@ export default {
function exportTaskStu() { function exportTaskStu() {
console.log("props.projectTaskInfo", props.projectTaskInfo); console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open( window.open(
`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2` `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=2`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({

18
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -613,23 +613,23 @@ export default {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 3,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.courseId,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, // taskId: props.projectTaskInfo.projectTaskId,
}); });
api api
.AssessmentManagementMessage({ .AssessmentManagementMessage({
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId, currentStageId: props.projectTaskInfo.stageId,
type: 1, type: 3,
pid: props.projectTaskInfo.projectId, pid: props.projectTaskInfo.courseId,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
taskId: props.projectTaskInfo.projectTaskId, // taskId: props.projectTaskInfo.projectTaskId,
taskType: props.projectTaskInfo.type, // taskType: props.projectTaskInfo.type,
}) })
.then((res) => { .then((res) => {
console.log("获取面授管理学员", res); console.log("获取面授管理学员", res);
@@ -733,9 +733,7 @@ export default {
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${ process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ }&type=3&pid=${props.projectTaskInfo.courseId}`
props.projectTaskInfo.projectTaskId
}&taskType=${props.projectTaskInfo.type}`
); );
} }

14
src/components/drawers/router/RouterFaceStu.vue
View File

@@ -181,7 +181,7 @@
v-model:AddImpStuvisible="AddImpStuvisible" v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose" @AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="datasource.courseId" :courseId="datasource.courseId"
:courseType="1" :courseType="3"
/> />
<!-- 批量签到弹窗 --> <!-- 批量签到弹窗 -->
<a-modal <a-modal
@@ -764,14 +764,14 @@ export default {
.AssessmentManagementMessage({ .AssessmentManagementMessage({
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.datasource.chapterId, // currentStageId: props.datasource.chapterId,
type: 2, type: 3,
pid: props.datasource.routerId, pid: props.datasource.courseId,
// status: Number(state.name), // status: Number(state.name),
signStatus: state.projectName2, signStatus: state.projectName2,
studentName: state.name, studentName: state.name,
taskId: props.datasource.routerTaskId, // taskId: props.datasource.routerTaskId,
taskType: props.datasource.type, // taskType: props.datasource.type,
}) })
.then((res) => { .then((res) => {
console.log("获取面授管理学员", res); console.log("获取面授管理学员", res);
@@ -822,7 +822,7 @@ export default {
process.env.VUE_APP_BASE_API process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${ }/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2&taskId=${props.datasource.routerTaskId}` }&type=3&pid=${props.datasource.courseId}&thirdType=2`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({

29
src/components/drawers/router/RouterFaceTeachManage.vue
View File

@@ -549,26 +549,15 @@ export default {
// 获取数据 // 获取数据
//获取学员 //获取学员
const getStudent = () => { const getStudent = () => {
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
});
api api
.AssessmentManagementMessage({ .AssessmentManagementMessage({
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
currentStageId: props.datasource.chapterId, currentStageId: props.datasource.chapterId,
type: 2, type: 3,
pid: props.datasource.routerId, pid: props.datasource.courseId,
taskId: props.datasource.routerTaskId, // taskId: props.datasource.routerTaskId,
taskType: props.datasource.type, // taskType: props.datasource.type,
status: state.projectName, status: state.projectName,
studentName: state.name, studentName: state.name,
}) })
@@ -622,7 +611,7 @@ export default {
`${ `${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskType=${2}&taskId=${props.datasource.routerTaskId}` }&type=3&pid=${props.datasource.courseId}`
); );
// api // api
// .exportTaskStudent({ // .exportTaskStudent({
@@ -647,10 +636,10 @@ export default {
state.downloadUrl = null; state.downloadUrl = null;
let obj = { let obj = {
currentStageId: props.datasource.chapterId, currentStageId: props.datasource.chapterId,
pid: props.datasource.routerId, pid: props.datasource.courseId,
taskId: props.datasource.routerTaskId, // taskId: props.datasource.routerTaskId,
taskType: props.datasource.type, // taskType: props.datasource.type,
type: 2, type: 3,
}; };
api api
.exportHomeWork(obj) .exportHomeWork(obj)

2
src/components/student/TableStudent.vue
View File

@@ -362,7 +362,7 @@
v-model:AddImpStuvisible="AddImpStuvisible" v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose" @AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id" :courseId="id"
:courseType="type === 1 ? 3 : 4" :courseType="type"
/> />
</template> </template>
<script setup> <script setup>