diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index ca3f8f34..88a85ba3 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,14 +1,15 @@ //学员列表带分页 -export const USER_LIST_PAGE = '/userbasic/user/list post' +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 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/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' \ No newline at end of file +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_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`; \ No newline at end of file diff --git a/src/api/request.js b/src/api/request.js index 945daf79..18d527f0 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -237,7 +237,7 @@ export function useRequest(_url, params = {}, init = true) { }; } -export async function boeRequest(_url, params) { +export async function boeRequest(_url, params = {}) { const s = _url.split(' ') let url = s[0] const method = s[1]?.toLowerCase() || 'get' diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 46e0c03b..19b489f3 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -17,7 +17,7 @@
- + {{ taskIndex === -1 ? '选择/新建课程' : '重新选择' }} @@ -46,7 +46,9 @@ import {message} from "ant-design-vue"; import CreateOnline from "@/components/drawers/CreateOnline.vue"; const props = defineProps({ - type: Number, + infoType: Number, + courseSyncFlag: Number, + id: Number, taskList: [] }) const visible = ref(false) @@ -133,6 +135,10 @@ function confirm() { function selectCourse(row) { console.log(row) + if(!props.courseSyncFlag && !row.refId){ + message.warning("请新建本项目在线课!"); + return + } rowSelectKeys.value = [row.id] selectsData.value = [row] onlineRef.value.closeModal() diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 79707622..68a6f37f 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -59,7 +59,7 @@ {{ formData.examinationTestName }}
- +
@@ -327,6 +327,8 @@ watch(() => formData.value.examType, () => { const closeDrawer = () => { visible.value = false taskIndex.value = -1 + formData.value.examinationLimit = '' + formData.value.examinationExplain = '' resetFields() dateTime.value = [] }; diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue index 8bb43ba0..9c63c00f 100644 --- a/src/components/drawers/CommonTest.vue +++ b/src/components/drawers/CommonTest.vue @@ -68,14 +68,14 @@
选择试卷:
- +
-
+
{{ formData.examinationTestName }} @@ -327,7 +327,7 @@ const props = defineProps({ const visible = ref(false) const initValue = { examinationName: '', - examinationTestId: '', + examinationPaperId: '', examinationStartTime: '', examinationEndTime: '', examinationDuration: '', @@ -349,7 +349,7 @@ const innerRule = { message: '请输入考试名称', }, ], - examinationTestId: [ + examinationPaperId: [ { required: true, message: '请输入选择试卷', @@ -440,7 +440,7 @@ function openDrawer() { } const delTag = () => { - formData.value.examinationTestId = ''; + formData.value.examinationPaperId = ''; formData.value.examinationTestName = ''; } diff --git a/src/components/drawers/CreateOnline.vue b/src/components/drawers/CreateOnline.vue index ebf178d1..7b9ad6a2 100644 --- a/src/components/drawers/CreateOnline.vue +++ b/src/components/drawers/CreateOnline.vue @@ -3,38 +3,44 @@