diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 1cda04a2..1c5ed0b8 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -14,6 +14,8 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa //新建或编辑项目 export const editProj = (obj) => http.post('/admin/project/edit', obj) + +export const editProjs = (obj) => http.post('/admin/project/editStatus', obj) //编辑项目共享文档 export const editProjDoc = (obj) => http.post('/admin/project/editShareAttach', obj) diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index ab5ed21b..015d2272 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -284,7 +284,7 @@ 评估：
- 需要评估
@@ -338,6 +338,9 @@ const removePG = () => { const getchange = (mess) => { console.log(mess); //输出true或者false }; +const getchanges = (mess) => { + console.log(mess); //输出true或者false +}; const props = defineProps({ type: Number, taskList: [], @@ -355,7 +358,7 @@ const formData = ref({ liveCover: "", beforeSignIn: "", afterSignIn: "", - isEvaluate: "", + isEvaluate: false, assessmentId: "", assessmentName: "", livePlayback: "", @@ -375,7 +378,7 @@ const rulesRef = ref({ { type: "url", required: true, - message: "请输入直播链接", + message: "请输入合法的直播链接", }, ], liveStartTime: [ diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index c06a1061..dca1f0f7 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -380,7 +380,7 @@ export default { }, }; - + - \ No newline at end of file diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index 4234541c..6e334e37 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -99,7 +99,7 @@ onChange: onSelectChange, }" /> - +
{ state.projectName = value; diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue index abced042..51040d0a 100644 --- a/src/components/drawers/NoticePub.vue +++ b/src/components/drawers/NoticePub.vue @@ -62,7 +62,7 @@ - + - \ No newline at end of file diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index e81fa5e6..ca4dd63c 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -10,7 +10,7 @@ >
-
【作业111】{{ title }}
+
【作业】{{ title }}
@@ -443,6 +443,7 @@ export default { }} > @@ -521,6 +522,7 @@ export default { studentName: state.name, }) .then((res) => { + debugger console.log("获取作业管理学员", res); if (res.data.code == 200) { let newData = []; @@ -594,7 +596,7 @@ export default { let obj = { currentStageId: props.datasource.chapterId, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, type: 2, }; @@ -603,6 +605,7 @@ export default { .then((res) => { console.log("导出作业", res.data.data); if (res.data.code === 200) { + debugger // message.destroy(); // message.success("导出作业成功"); state.exportHomeWorkV = true; diff --git a/src/components/drawers/router/RouterProjectManage.vue b/src/components/drawers/router/RouterProjectManage.vue index 5f8f797e..253846fa 100644 --- a/src/components/drawers/router/RouterProjectManage.vue +++ b/src/components/drawers/router/RouterProjectManage.vue @@ -23,7 +23,7 @@ v-if="datasource.type !== 6 && datasource.type !== 9" class="endtime" > - +
@@ -48,7 +48,7 @@ placeholder="请选择" :options="projectNameList" @change="selectProjectName" - + >
@@ -160,7 +160,7 @@ }, }, }, - + setup(props, ctx) { const state = reactive({ visible: props.PjModelVisible, @@ -171,7 +171,7 @@ tableDataTotal: 0, projectName: undefined, projectNameList: [ - + { id: 1, value: "1", @@ -195,9 +195,9 @@ courseID: "", - routerId: '', - studentId: '', - CheckStuvisible: false, + routerId: '', + studentId: '', + CheckStuvisible: false, }); const tableDataFunc = () => { const columns = [ @@ -239,7 +239,7 @@ key: "studentDepartName", width: "20%", align: "center", - + className: "h", ellipsis: true, customRender: (text) => { @@ -378,7 +378,7 @@ () => { {/* 当前学员 用来查看学员详情 */} state.routerId = value.record.routerId; - state.studentId = value.record.studentId; + state.studentId = value.record.studentId; state.CheckStuvisible = true; console.log(value); }}> @@ -390,7 +390,7 @@ ]; return columns; }; - + const closeDrawer = () => { ctx.emit("update:PjModelVisible", false); state.currentPage = 1; @@ -417,7 +417,7 @@ const onChange = (pageNumber) => { console.log("Page: ", pageNumber); }; - + // 获取数据 function getData() { if(props.datasource.type === 13){ @@ -428,7 +428,7 @@ currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.routerTaskId, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -449,7 +449,7 @@ state.tabledata = []; } } - + // 搜索按钮 function searchTaskList() { state.currentPage = 1; @@ -464,20 +464,20 @@ state.projectName = undefined; getData(); } - + //分页 const changePaginationStu = (page) => { state.tableDataTotalLoading = true; state.currentPage = page; getData(); }; - + // 导出数据 function exportTaskStu() { console.log(`${process.env.VUE_APP_BASE_API}/project/management/exportProjectManage?courseId=${props.datasource.courseId}`) window.open(`${process.env.VUE_APP_BASE_API}/project/management/exportProjectManage?courseId=${props.datasource.courseId}`) } - + return { ...toRefs(state), selectProjectName, @@ -496,7 +496,7 @@ }, }; - + - \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 00d716a1..4d76dbe8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1629,6 +1629,29 @@ const columns1 = [ return text ? text : "-"; }, }, + { + title: " 资源归属", + width: 250, + dataIndex: "sourceBelongFullName", + key: "3", + align: "center", + ellipsis: true, + customRender: ({text}) => { + return text ? text : "-"; + }, + }, + + { + title: " 目标人群", + width: 250, + dataIndex: "targetUser", + key: "3", + align: "center", + ellipsis: true, + customRender: ({text}) => { + return text ? text : "-"; + }, + }, { title: "学习人数", width: 130, @@ -3353,12 +3376,12 @@ export default defineComponent({ if (state.selectTime) { // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000); // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000); - beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm') + beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss') // toDate( // new Date(state.selectTime[0].$d).getTime() / 1000, // "Y-M-D h:m:s" // ); - endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm') + endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss') // toDate( // new Date(state.selectTime[1].$d).getTime() / 1000, // "Y-M-D h:m:s" diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index a01d8184..8a6d56b4 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1522,8 +1522,8 @@ export default { state.editPathId = id; let arr = imgData.value; arr.forEach((item) => { - if (item.dictValue === state.pathBg) { - state.pathBgId = item.dictCode; + if (item.value === state.pathBg) { + state.pathBgId = item.code; } }); diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 6833149f..e0fa3030 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -102,7 +102,7 @@ dayjs(state.timeRange[0]).endOf("YYYY-MM-DD HH:mm"); } - return current && current < dayjs().endOf('day'); + // return current && current < dayjs().endOf('day'); + return current && current < dayjs().subtract(1, 'days').endOf('day') }; function calendarChange(date, dateStr, partial) { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 65a29af1..729d930e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -4052,6 +4052,7 @@ export default { parentId: state.parentId, picUrl: state.picUrl, projectId: Number(state.projectId), + id: Number(state.projectId), remark: state.remark, sourceBelongId: Number(state.tsourceBelong), status: state.status, @@ -4074,6 +4075,7 @@ export default { parentId: state.parentId, picUrl: state.picUrl, projectId: Number(state.projectId), + id: Number(state.projectId), remark: state.remark, sourceBelongId: Number(state.tsourceBelong), status: state.status,