diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 5f0c2f22..4af282c4 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -412,6 +412,10 @@ export default { type: Number, default: null, }, + taskCourseID: { + type: Number, + default: null, + }, EditFaceId: { // 要编辑的workId type: Number, @@ -666,6 +670,7 @@ export default { //新建或编辑面授 // 新增任务 const updateFaceTeach = () => { + console.log(props) if ( state.courseName == "" || state.chooseCourse == null || @@ -695,12 +700,17 @@ export default { afterStart: state.afterStartValue || 0, beforeStart: state.before || 0, - beginTime: parseInt( - new Date(state.chooseTime[0].$d).getTime() / 1000 - ), + // beginTime: parseInt( + // new Date(state.chooseTime[0].$d).getTime() / 1000 + // ), + // beginTime: dayjs(new Date(state.chooseTime[0]).getTime(), "YYYY-MM-DD HH-mm"), + beginTime: dayjs(state.chooseTime[0]).format("YYYY-MM-DD HH:mm"), + completeType: type.concat(t), description: state.description, - endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000), + // endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000), + // endTime: dayjs(new Date(state.chooseTime[1]).getTime(), "YYYY-MM-DD HH-mm"), + endTime: dayjs(state.chooseTime[1]).format("YYYY-MM-DD HH:mm"), evalFlag: state.needEval && state.assessmentId > 0 ? 1 : 0, evaluateId: state.assessmentId, homeWorkId: state.EditWorkId, @@ -711,7 +721,7 @@ export default { testId: state.EditTestId, duration: state.duration, attach:state.attach, - id: props.edit ? props.taskIdDraft : null + id: props.edit ? props.taskIdDraft : props.taskCourseID }; console.log("obj============", obj, "6" + "9"); console.log("222222222"); @@ -719,6 +729,7 @@ export default { editPlan(obj) .then(async (res) => { message.destroy(); + console.log('添加成功----》', res) // message.success(`添加成功`); await updateTask(res); ctx.emit("changeData", false); @@ -744,15 +755,16 @@ export default { message.destroy(); return message.warning("请先选中关卡"); } + console.log('=====>1111',props.edit , props.taskIdDraft , props.taskCourseID) let editObj1 = { chapterId: props.isactive, - courseId: res.data.data.offcoursePlanId, + courseId: res.data.data.id, name: res.data.data.name, duration: res.data.data.duration, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 2, - id: props.taskIdDraft + id: props.edit ? props.taskIdDraft : res.data.data.id }; await RouterEditTask(editObj1) .then(() => { @@ -773,7 +785,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 2, - id: props.taskIdDraft + id: props.edit ? props.taskIdDraft : props.taskCourseID }; // 新增编辑或新增项目 await ProjectEditTask(editObj) @@ -794,7 +806,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 2, - id: props.taskIdDraft + id: props.edit ? props.taskIdDraft : props.taskCourseID }) .then(() => { //message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` ); diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index d70845cf..6b552a3f 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -743,7 +743,6 @@ export default { liveExplain: state.textV1, liveNotice: state.liveNotice, liveFlag: "", - id: props.edit ? Number(props.EditLiveId) : 0, liveLink: state.inputV4, liveName: state.inputV1, livePlayback: state.switchC1 ? "1" : "0", diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 3b7f5c86..bbf2cc2d 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -274,7 +274,10 @@ export default { type: Number, default: null, }, - + taskCourseID: { + type: Number, + default: null, + }, projectTaskId: { // 要编辑的projectId type: Number, @@ -506,9 +509,9 @@ export default { data.map((value) => { if (value.type == 3) { let obj = { - key: value.projectId, + key: value.id, parentId: value.parentId, - projectId: value.projectId, + projectId: value.id, name: value.name, manager: value.manager, time: dayjs(value.createTime).format("YYYY-MM-DD"), diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 0f16e949..16bbc9ca 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -454,7 +454,7 @@ export default { // 导出数据 function exportTaskStu() { - 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}&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}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) } diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index fcfcfde8..b49e84bb 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1544,7 +1544,7 @@ import { useStore } from "vuex"; import DropDown from "@/components/common/DropDown"; import { checkPer } from "@/utils/utils"; import dayjs from "dayjs"; -import { commonExport } from '@/utils/commonExcel' +// import { commonExport } from '@/utils/commonExcel' //列表表格 const columns1 = [ @@ -4052,50 +4052,50 @@ export default defineComponent({ ); endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000); } + console.log(startTime,endTime) - - list({ - pageNo: 1, - pageSize: 100000, - auditStatus: state.auditStatus, - // categoryId: state.categoryId, - sysTypeId: state.sysTypeId, - projectName: state.projectName, - name: state.name, - createName: state.createName, - endTime: endTime, - beginTime: startTime, - }).then(res=>{ - let list = res.data.data.rows.map(s=>{ - s.contentTxt = findClassFullName(sysTypeOptions.value, s.sysTypeId) || "-"; - s.typeName = '面授' - s.publishStatusText = s.publishStatus === 0?'未发布':'已发布' - s.statusText = s.status === 0?'否':'是' - s.auditStatusText = s.auditStatus === 0?'未提交': s.auditStatus === 1?'待审核':s.auditStatus === 2?'已审核':s.auditStatus === -1?"审核未通过":'' - return s - }) - console.log(list) - let heads = [ - { header: '名称', key: 'name', width: 18 }, - { header: '类型', key: 'typeName', width: 10 }, - { header: '归属路径图', key: 'routerName', width: 13 }, - { header: '归属项目', key: 'projectName', width: 13 }, - { header: '内容分类', key: 'contentTxt', width: 20 }, - // { header: '一级分类', key: 'firstLevelCategory', width: 10 }, - // { header: '二级分类', key: 'secondLevelCategory', width: 10 }, - // { header: '三级分类', key: 'thirdLevelCategory', width: 10 }, - { header: '开课次数', key: 'planCnt', width: 10 }, - { header: '学习人数', key: 'studentCnt', width: 10 }, - { header: '评分', key: 'score', width: 10 }, - { header: '状态', key: 'auditStatusText', width: 20 }, - { header: '是否发布', key: 'publishStatusText', width: 10 }, - { header: '创建人', key: 'createName', width: 10 }, - { header: '创建时间', key: 'createTime', width: 22 }, - { header: '上线时间', key: 'publishTime', width: 22 }, - { header: '是否停用', key: 'statusText', width: 10 }, - ] - commonExport(heads,list,"课程导出") - }) + // list({ + // pageNo: 1, + // pageSize: 100000, + // auditStatus: state.auditStatus, + // // categoryId: state.categoryId, + // sysTypeId: state.sysTypeId, + // projectName: state.projectName, + // name: state.name, + // createName: state.createName, + // endTime: endTime, + // beginTime: startTime, + // }).then(res=>{ + // let list = res.data.data.rows.map(s=>{ + // s.contentTxt = findClassFullName(sysTypeOptions.value, s.sysTypeId) || "-"; + // s.typeName = '面授' + // s.publishStatusText = s.publishStatus === 0?'未发布':'已发布' + // s.statusText = s.status === 0?'否':'是' + // s.auditStatusText = s.auditStatus === 0?'未提交': s.auditStatus === 1?'待审核':s.auditStatus === 2?'已审核':s.auditStatus === -1?"审核未通过":'' + // return s + // }) + // console.log(list) + // let heads = [ + // { header: '名称', key: 'name', width: 18 }, + // { header: '类型', key: 'typeName', width: 10 }, + // { header: '归属路径图', key: 'routerName', width: 13 }, + // { header: '归属项目', key: 'projectName', width: 13 }, + // { header: '内容分类', key: 'contentTxt', width: 20 }, + // // { header: '一级分类', key: 'firstLevelCategory', width: 10 }, + // // { header: '二级分类', key: 'secondLevelCategory', width: 10 }, + // // { header: '三级分类', key: 'thirdLevelCategory', width: 10 }, + // { header: '开课次数', key: 'planCnt', width: 10 }, + // { header: '学习人数', key: 'studentCnt', width: 10 }, + // { header: '评分', key: 'score', width: 10 }, + // { header: '状态', key: 'auditStatusText', width: 20 }, + // { header: '是否发布', key: 'publishStatusText', width: 10 }, + // { header: '创建人', key: 'createName', width: 10 }, + // { header: '创建时间', key: 'createTime', width: 22 }, + // { header: '上线时间', key: 'publishTime', width: 22 }, + // { header: '是否停用', key: 'statusText', width: 10 }, + // ] + // commonExport(heads,list,"课程导出") + // }) // window.open( // `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${ diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index bcc1e147..b826be2c 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -19,8 +19,8 @@