diff --git a/src/App.vue b/src/App.vue index 47d17687..ea45c79e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,7 +41,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.02------------"); + console.log("版本0.05------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/indexExam.js b/src/api/indexExam.js index b38ba155..9f3bdbeb 100644 --- a/src/api/indexExam.js +++ b/src/api/indexExam.js @@ -20,4 +20,6 @@ export const queryExaminationList = (obj) => http.post('/examination/queryExamin // 获取考试任务列表的接口-三方 export const queryExaminationAloneExtendList = (obj) => http.post('/examination/queryExaminationAloneExtendList', obj); // 对接三方考试任务保存接口-三方 -export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj); \ No newline at end of file +export const examinationTaskSave = (obj) => http.post('/examination/examinationTaskSave', obj); +//编辑考试信息 +export const updateExamination = (obj) => http.post('/examination/updateExamination', obj); \ No newline at end of file diff --git a/src/api/indexOnline.js b/src/api/indexOnline.js index b69d20ec..29174b09 100644 --- a/src/api/indexOnline.js +++ b/src/api/indexOnline.js @@ -12,7 +12,7 @@ import http from "./config"; // 接口-请求 //查询在线课信息列表接口 -export const queryOnlinelList = (obj) => http.post('/queryOnlineClassesDetailList', obj) +export const queryOnlinelList = (obj) => http.post('/onlineClasses/queryOnlineClassesDetailList', obj) diff --git a/src/components/Modals/addOnlineCourse.vue b/src/components/Modals/addOnlineCourse.vue index 08cb2c93..ba329210 100644 --- a/src/components/Modals/addOnlineCourse.vue +++ b/src/components/Modals/addOnlineCourse.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-24 16:39:48 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-29 15:28:34 + * @LastEditTime: 2022-11-29 18:31:34 * @FilePath: /fe-manage/src/components/Modals/addOnlineCourse.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -42,6 +42,10 @@ export default { type: Boolean, default: false, }, + closeOnlineModal: { + type: Function, + default: () => {}, + }, }, setup(props, ctx) { // console.log("学习路径", props.addOnlineCoursevisible, ctx); @@ -50,6 +54,7 @@ export default { }); const closeModal = () => { ctx.emit("update:addOnlineCoursevisible", false); + props.closeOnlineModal(); }; return { ...toRefs(state), diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 603ffe64..c050de77 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -160,7 +160,6 @@ export default { currentPage: 1, tableDataTotal: 0, pageSize: 10, - searching:false, selectedRowKeys: [], apiTaskList: [], inputV1: "", @@ -222,23 +221,6 @@ export default { const getTableDate = (tableData) => { let data = tableData; let array = []; - if(state.searching){ - data.map((value, index) => { - let obj = { - key: index, - authorId: value.authorId, - authorName: value.authorName, - companyId: value.companyId, - coverUrl: value.coverUrl, - id: value.id, - casesId: value.casesId, - title: value.title, - }; - if(obj.title == state.inputV1){ - array.push(obj); - } - }); - } else { data.map((value, index) => { let obj = { key: index, @@ -252,7 +234,6 @@ export default { }; array.push(obj); }); - } state.tableData = array; }; //获取全部案例信息接口 @@ -264,7 +245,7 @@ export default { orderField: "", pageIndex: state.currentPage, pageSize: state.pageSize, - top: true, + isTop: "", }) .then((res) => { if (res.status === 200) { @@ -318,10 +299,6 @@ export default { } } else if (props.isLevel == 3) { for (let i = 0; i < state.apiTaskList.length; i++) { - console.log( - state.apiTaskList[i], - "state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId" - ); apiTask .addTask({ courseId: state.apiTaskList[i].caseid, @@ -349,17 +326,14 @@ export default { //搜索案例列表 const searchList = ()=> { if(state.inputV1 !== ''){ - state.searching = true getAllCaseText() }else { - state.searching = false resetCase() } } //重置案例信息 const resetCase = () => { state.inputV1 = "" - state.searching = false state.selectedRowKeys=[] state.currentPage = 1 getAllCaseText(); diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 0c372be7..ac68ed22 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -198,7 +198,6 @@ export default { time: undefined, onlineClassesId: null, onlineName: "", - searching:false, selectV: "", selectedRowKeys: [], tableData: [], @@ -286,23 +285,10 @@ export default { let data = tableData; let array = []; data.map((value,index) => { - if(state.searching){ + { let obj = { key: index + 1, - num:"", - name:value.name, - contenttype:value.contentType == 10 ? "微课" : "录播课", - teacher:value.teacher, - sysCreateBy:value.sysCreateBy, - overtime:"", - }; - if(obj.name == state.inputV1 || obj.contenttype == state.selectV){ - array.push(obj); - } - } else { - let obj = { - key: index + 1, - num:"", + num:value.onlineClassesId, name:value.name, contenttype:value.contentType == 10 ? "微课" : "录播课", teacher:value.teacher, @@ -345,7 +331,7 @@ export default { state.addOnlineList.map((value) => { RouterEditTask({ chapterId: Number(props.isactive), - courseId: value.onlineClassesId, + courseId: value.num, name: value.name, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, @@ -363,11 +349,11 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); }) - } else if (props.isLevel == 2) { + } else if (props.isLevel === 2) { state.addOnlineList.map((value) => { apiTask .addTask({ - courseId: value.onlineClassesId, + courseId: value.num, name: value.name, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, @@ -415,7 +401,6 @@ export default { //搜索在线列表 const searchList = ()=> { if(state.inputV1 !== '' || state.selectV !== ''){ - state.searching = true getAllOnlineText() }else { resetOnline() @@ -425,7 +410,6 @@ export default { const resetOnline = () => { state.inputV1 = ""; state.selectV = ""; - state.searching = false; state.selectedRowKeys = []; state.addOnlineList = []; state.currentPage = 1; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 9eea4a31..1bfefaad 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -119,6 +119,7 @@ class="tag-style" v-if="paperName != ''" :closable="true" + @close="delTag" >{{ paperName }} +
{ + state.selectedRowKeys = [] ctx.emit("update:STvisible", false); }; @@ -217,56 +220,57 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.SelectTestData = selectedRows[0]; - console.log("state.SelectTestData---------------", state.SelectTestData); }; const newTest = () => { - console.log("创建考试没设计图"); state.addExamVisible = true; }; - const getTableDate = (tableData) => { - let data = tableData; - let array = []; - data.map((value, index) => { - let obj = { - key: index + 1, - sysCreateBy: value.sysCreateBy, - paperId: value.paperId, - testName: value.testName, - paperMode: value.paperMode, - sysUpdateTime: value.sysUpdateTime, - }; - array.push(obj); - }); - state.tableData = array; - }; + // const getTableDate = (tableData) => { + // let data = tableData; + // let array = []; + // data.map((value, index) => { + // let obj = { + // key: index + 1, + // sysCreateBy: value.sysCreateBy, + // paperId: value.paperId, + // testName: value.testName, + // paperMode: value.paperMode == 1 ? "固定试卷" : "随机", + // sysUpdateTime: value.sysUpdateTime, + // }; + // array.push(obj); + // }); + // state.tableData = array; + // state.tableDataTotal = array.length + // }; //获取选择考试列表 const getManageList = () => { let obj = { keyWord: state.inputPname, - pageIndex: state.pageSize, + pageIndex: state.currentPage, pageSize: state.pageSize, published: true, }; api .queryExaminationList(obj) .then((data) => { - // getTableDate(res.data.data); //** 表格repaint */ let array = [] - data.map((value, index) => { + data.data.data.map((value, index) => { let obj = { key: index + 1, sysCreateBy: value.sysCreateBy, - paperId: value.paperId, + paperId: index + 1, testName: value.testName, - paperMode: value.paperMode, + paperMode: value.randomMode ? "是" : "否", sysUpdateTime: value.sysUpdateTime, + id:value.id, }; array.push(obj); }); - //** */ + state.tableData = array + state.tableDataTotal = array.length + message.destroy() message.success("获取选择考试列表成功"); }) .catch(() => { @@ -289,7 +293,6 @@ export default { ...toRefs(state), closeDrawer, afterVisibleChange, - getTableDate, onSelectChange, CreatSTText, newTest, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 6ac3813f..742c6201 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -458,7 +458,7 @@
{ return triggerNode.parentNode || document.body; } @@ -480,12 +480,12 @@
-
{ return triggerNode.parentNode || document.body; } @@ -2506,7 +2506,10 @@ classify="addstudent" /> - + @@ -4825,6 +4828,11 @@ export default defineComponent({ }); } ); + + const closeOnlineCoursevisible = () => { + console.log("执行"); + getTableDate(); + }; return { ...toRefs(state), getdateToDateFn, @@ -4931,6 +4939,8 @@ export default defineComponent({ showOwnPrower, showViewPrower, showManagePrower, + + closeOnlineCoursevisible, }; }, }); diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index 86d08a4b..09eaebd3 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -15,34 +15,33 @@
@@ -61,26 +60,26 @@
@@ -89,23 +88,16 @@