feat:合并

This commit is contained in:
lixg
2023-01-11 19:10:22 +08:00
17 changed files with 31 additions and 41 deletions

View File

@@ -34,7 +34,7 @@
:data=" :data="
courseType == 1 courseType == 1
? { ? {
stageId: Number(courseId), targetId: Number(courseId),
type: 3, type: 3,
userId: userId, userId: userId,
userName: userName, userName: userName,

View File

@@ -195,7 +195,7 @@ export default {
console.log('我是传递过来的参数2', props.basicdata) console.log('我是传递过来的参数2', props.basicdata)
api.QueryAssessmentDetail({ api.QueryAssessmentDetail({
"assessmentSubmitId": props.datasource.assessmentSubmitId, "assessmentSubmitId": props.datasource.assessmentSubmitId,
"courseId": props.datasource.courseId, "courseId": props.basicdata.assessmentId,
"studentId": props.datasource.studentId "studentId": props.datasource.studentId
}).then(res=>{ }).then(res=>{
console.log(res) console.log(res)

View File

@@ -405,8 +405,8 @@ export default {
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
window.open(`${process.env.VUE_APP_PROXY_URL}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}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}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}`) // 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}`)
} }
return { return {

View File

@@ -414,7 +414,7 @@ export default {
{/* 导出数据 */} {/* 导出数据 */}
function exportData() { function exportData() {
window.open(`${process.env.VUE_APP_PROXY_URL}admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
{/* api.ExportExam({ {/* api.ExportExam({
"chapterId": props.datasource.chapterId, "chapterId": props.datasource.chapterId,
"targetId": props.datasource.routerId, "targetId": props.datasource.routerId,

View File

@@ -867,8 +867,7 @@ export default {
console.log("props.projectTaskInfo", props.projectTaskInfo); console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
}admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=0` }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=0`
); );

View File

@@ -676,8 +676,7 @@ export default {
console.log("props.projectTaskInfo", props.projectTaskInfo); console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
}admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}taskType=2` }&type=${1}&pid=${props.projectTaskInfo.projectId}taskType=2`
); );
@@ -731,8 +730,7 @@ export default {
console.log("props.projectTaskInfo", props.projectTaskInfo); console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
}admin/student/exportHomeWork?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
props.projectTaskInfo.projectTaskId props.projectTaskInfo.projectTaskId

View File

@@ -566,8 +566,7 @@ export default {
function exportTaskStu() { function exportTaskStu() {
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
}admin/student/exportTaskStudent?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=4` }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=4`
); );
@@ -621,8 +620,7 @@ export default {
console.log("props.projectTaskInfo", props.projectTaskInfo); console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
}admin/student/exportHomeWork?currentStageId=${
props.projectTaskInfo.stageId props.projectTaskInfo.stageId
}&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
props.projectTaskInfo.projectTaskId props.projectTaskInfo.projectTaskId

View File

@@ -451,8 +451,8 @@ export default {
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
window.open(`${process.env.VUE_APP_PROXY_URL}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}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}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}`) // 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}`)
} }
return { return {

View File

@@ -453,9 +453,9 @@ export default {
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
console.log(`${process.env.VUE_APP_PROXY_URL}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.routerTaskId}&taskType=${props.datasource.type}`)
window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&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.routerTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}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}`) // 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}`)
} }
return { return {

View File

@@ -404,9 +404,9 @@ export default {
// 导出数据 // 导出数据
function exportTaskStu() { function exportTaskStu() {
console.log(`${process.env.VUE_APP_PROXY_URL}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.routerTaskId}&taskType=${props.datasource.type}`)
window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&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.routerTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}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}`) // 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}`)
} }
return { return {

View File

@@ -433,7 +433,7 @@ export default {
{/* 导出数据 */} {/* 导出数据 */}
function exportData() { function exportData() {
window.open(`${process.env.VUE_APP_PROXY_URL}admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
{/* api.ExportExam({ {/* api.ExportExam({
"chapterId": props.datasource.chapterId, "chapterId": props.datasource.chapterId,
"targetId": props.datasource.routerId, "targetId": props.datasource.routerId,

View File

@@ -757,6 +757,7 @@ export default {
// status: Number(state.name), // status: Number(state.name),
studentName: state.name, studentName: state.name,
taskId: props.datasource.routerTaskId, taskId: props.datasource.routerTaskId,
taskType: props.datasource.type,
}); });
api api
.AssessmentManagementMessage({ .AssessmentManagementMessage({
@@ -816,8 +817,8 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL 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` }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2`
); );

View File

@@ -622,8 +622,7 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL 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` }&type=${2}&pid=${props.datasource.routerId}&taskType=2`
); );
@@ -678,8 +677,7 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
}admin/student/exportHomeWork?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskId=${ }&type=${2}&pid=${props.datasource.routerId}&taskId=${
props.datasource.routerTaskId props.datasource.routerTaskId

View File

@@ -576,8 +576,7 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL 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=4` }&type=${2}&pid=${props.datasource.routerId}&taskType=4`
); );
@@ -631,8 +630,7 @@ export default {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
}admin/student/exportHomeWork?currentStageId=${
props.datasource.chapterId props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskId=${ }&type=${2}&pid=${props.datasource.routerId}&taskId=${
props.datasource.routerTaskId props.datasource.routerTaskId

View File

@@ -503,8 +503,7 @@ function exportTaskStu() {
console.log("props.datasource", props.datasource); console.log("props.datasource", props.datasource);
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
}admin/student/exportTaskStudent?type=${1}&pid=${props.id}&taskType=0`
); );
} }
@@ -709,8 +708,7 @@ const exportHomeWorkShow = () => {
const exportStu = () => { const exportStu = () => {
window.open( window.open(
`${ `${
process.env.VUE_APP_PROXY_URL process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
}admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
); );
}; };

View File

@@ -4994,7 +4994,7 @@ export default defineComponent({
} }
window.open( window.open(
`${process.env.VUE_APP_PROXY_URL}admin/offcourse/export?pageNo=${ `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
state.currentPage1 state.currentPage1
}&pageSize=${state.pageSize1}&auditStatus=${ }&pageSize=${state.pageSize1}&auditStatus=${
state.auditStatus ? state.auditStatus : "" state.auditStatus ? state.auditStatus : ""
@@ -5004,7 +5004,7 @@ export default defineComponent({
state.createName ? state.createName : "" state.createName ? state.createName : ""
}&endTime=${endTime ? endTime : ""}&beginTime=${ }&endTime=${endTime ? endTime : ""}&beginTime=${
startTime ? startTime : "" startTime ? startTime : ""
}` }&type=3`
); );
{ {

View File

@@ -154,7 +154,7 @@ export default {
// 导出学员信息 // 导出学员信息
function exportStudentInfo() { function exportStudentInfo() {
window.open(`${process.env.VUE_APP_PROXY_URL}admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?assessmentId=${state.basicInfo.assessmentId}`)
} }
//分页 //分页