diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 788346fc..ca3f8f34 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -4,9 +4,11 @@ export const USER_LIST_PAGE = '/userbasic/user/list post' export const USER_LIST = '/userbasic/user/searchList post' export const ORG_LIST = '/userbasic/org/list post' export const ORG_CHILD_LIST = '/userbasic/org/info post' -export const AUDIENCE_LIST = '/userbasic/audience/list post' +// export const AUDIENCE_LIST = '/userbasic/audience/list post' +//当前用户可以查看的受众接口 +export const AUDIENCE_LIST = '/userbasic/audience/userAudiencesFilter post' export const USER_PERMISSION = '/userbasic/permission/listByUser post' export const CASE_PAGE = '/systemapi/xboe/m/boe/cases/pagelist post formData' export const EXAM_PAPER_PAGE = '/systemapi/xboe/m/exam/paper/querylist post formData' export const TEST_PAGE = '/api/b1/system/quiz/quiz-list post formData' -export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData' +export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData' \ No newline at end of file diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 0f01aba5..a9a1a555 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -258,6 +258,7 @@ const formData = ref({ assessmentId: "", assessmentName: "", livePlayback: "", + liveExplain: "" }); const emit = defineEmits({}); const taskIndex = ref(-1); @@ -375,9 +376,9 @@ async function confirm() { } else { const data = props.taskList[taskIndex.value]; data.name = formData.value.liveName; - data.info = formData.value; + data.info = {...formData.value}; data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes') - + console.log(data) } emit("update:taskList", [...props.taskList]); closeDrawer(); diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue index 7bce6344..c79e86c3 100644 --- a/src/components/drawers/ViewAssess.vue +++ b/src/components/drawers/ViewAssess.vue @@ -195,7 +195,7 @@ export default { console.log('我是传递过来的参数2', props.basicdata) api.QueryAssessmentDetail({ "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds, - "courseId": props.basicdata.id, + "courseId": props.datasource.courseId, "studentId": props.datasource.studentId }).then(res=>{ console.log(res) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 4b1ff864..8c4a4890 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -169,13 +169,13 @@ export default { }, { id: 2, - value: "10", - label: "未通过", + value: "9", + label: "已完成", }, { id: 3, value: "1", - label: "已通过", + label: "进行中", }, ], selectedRowKeys: [], @@ -305,7 +305,7 @@ export default { align: "center", ellipsis: true, className: "h", - customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'), + customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'), }, { title: "操作", diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue index 8d1a1aa6..c6497a16 100644 --- a/src/components/drawers/project/ProjectVoteManage.vue +++ b/src/components/drawers/project/ProjectVoteManage.vue @@ -360,7 +360,7 @@ "studentName": state.name, "targetId":props.datasource.projectId, "taskId": props.datasource.courseId, - "type": 2 + "type": 1 }); api.QueryVoteManagementDetail({ "pageNo": state.currentPage, @@ -370,7 +370,7 @@ "studentName": state.name, "targetId":props.datasource.routerId, "taskId": props.datasource.courseId, - "type": 2 + "type": 1 }).then(res=>{ console.log('投票数据获取', res) if(res.data.code==200){ diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 317ea972..89e0abe0 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -128,16 +128,19 @@ --> +