diff --git a/src/App.vue b/src/App.vue index 34e2c921..f1c4b1d6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -34,7 +34,7 @@ import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis"; const store = useStore(); const isLogin = ref(false); -console.log("版本3.1.2------------"); +console.log("版本3.3.1------------"); // 监听关闭浏览器 diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 9fb90dc7..0ef747a5 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -16,4 +16,6 @@ export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formDa export const LOGOUT = "/userbasic/logout post"; export const REFRESH_TOKEN_API = "/userbasic/refreshToken"; +export const COURSE_AUDIT = "/systemapi/xboe/m/course/manage/audit post formData"; +export const OTHER_AUDIT = "/systemapi/xboe/m/course/audit/appoint 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/components/Modals/addOnlineCourse.vue b/src/components/Modals/addOnlineCourse.vue index ba329210..d4599699 100644 --- a/src/components/Modals/addOnlineCourse.vue +++ b/src/components/Modals/addOnlineCourse.vue @@ -22,7 +22,7 @@ style="width: 100%; height: 100%" :src="iframeUrl + '/course/manages'" name="myframe" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-scripts allow-downloads allow-same-origin allow-popups" > diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 6a17eac6..3d6b3958 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -572,7 +572,7 @@ 问答 - 旧版 + 旧版 业务 @@ -598,7 +598,7 @@ export default { const store = useStore(); const state = reactive({ packup: false, - screenHeight: document.body.clientHeight, // 屏幕高度 + screenHeight: document.body.clientHeight, // 屏幕 高度 rootSubmenuKeys: [ "sub1", "sub2", diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 8788129f..1cf5e9d9 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -41,7 +41,7 @@ :data="{ targetId: Number(courseId), type: courseType, - userId: userInfo.id, + userId: userInfo.userId, userName: userInfo.realName, }" :showUploadList="false" diff --git a/src/components/drawers/CheckAnsware.vue b/src/components/drawers/CheckAnsware.vue index f6a3c003..a54fc849 100644 --- a/src/components/drawers/CheckAnsware.vue +++ b/src/components/drawers/CheckAnsware.vue @@ -25,7 +25,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue index 3d9335a1..c325f981 100644 --- a/src/components/drawers/CheckVote.vue +++ b/src/components/drawers/CheckVote.vue @@ -128,12 +128,12 @@ export default { function getData() { console.log('我是请求的参数', { "courseId": props.courseID, - "studentId": userInfo.value.id, + "studentId": userInfo.value.userId, "voteSubmitId": props.voteID }) api.QueryVoteTaskDetailById({ "courseId": props.courseID, - "studentId": userInfo.value.id, + "studentId": userInfo.value.userId, "voteSubmitId": props.voteID }).then(res=>{ console.log(res) diff --git a/src/components/drawers/CreateOnline.vue b/src/components/drawers/CreateOnline.vue index 0941e784..3c070bc0 100644 --- a/src/components/drawers/CreateOnline.vue +++ b/src/components/drawers/CreateOnline.vue @@ -17,7 +17,7 @@ :src="`${iframeUrl}/course/manages?f=choose&refId=${props.id}&refType=${props.type}`" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 3b9b94c7..4f811107 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -184,7 +184,7 @@ const initParams = { keyword: "", page: 1, size: 10, - user_id: store.state.userInfo.id, + user_id: store.state.userInfo.userId, // orderAsc: true }; const params = ref(initParams); diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index 7f134b9f..9f1c0e3c 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -83,7 +83,7 @@ style="width: 100%; height: 100%" :src="iframeUrl + '/exam/papers?addnew=true'" name="myframe" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/article/ArticleManage.vue b/src/views/article/ArticleManage.vue index 25c3f69b..0144ea57 100644 --- a/src/views/article/ArticleManage.vue +++ b/src/views/article/ArticleManage.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/courselibrary/CourseManage.vue b/src/views/courselibrary/CourseManage.vue index 2be927e3..c49f6a8b 100644 --- a/src/views/courselibrary/CourseManage.vue +++ b/src/views/courselibrary/CourseManage.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 73ce0867..36ea44a5 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4582,7 +4582,7 @@ export default defineComponent({ console.log(state.kk_inputV1); console.log(state.kk_inputV2); console.log(state.selectTime); - state.pageSize222 = 1 + state.pageSize222 = 10 state.currentPage1 = 1 getTableDate(); getTableDate3(); @@ -4593,7 +4593,7 @@ export default defineComponent({ state.selectTime = ""; state.currentPage2 = 1; state.tableDataTotal2 = []; - state.pageSize222 = 1 + state.pageSize222 = 10 state.currentPage1 = 1 getTableDate(); getTableDate3(); diff --git a/src/views/courselibrary/OnlineManage.vue b/src/views/courselibrary/OnlineManage.vue index 3c10d831..3d3c4060 100644 --- a/src/views/courselibrary/OnlineManage.vue +++ b/src/views/courselibrary/OnlineManage.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/examination/ExaminationCenter.vue b/src/views/examination/ExaminationCenter.vue index aae42b81..47001e3a 100644 --- a/src/views/examination/ExaminationCenter.vue +++ b/src/views/examination/ExaminationCenter.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/examination/PaperManage.vue b/src/views/examination/PaperManage.vue index 702475b5..a6c5f364 100644 --- a/src/views/examination/PaperManage.vue +++ b/src/views/examination/PaperManage.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/examination/QuestionManage.vue b/src/views/examination/QuestionManage.vue index 069934cc..6bec2382 100644 --- a/src/views/examination/QuestionManage.vue +++ b/src/views/examination/QuestionManage.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index e109a6d1..167adf82 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -511,15 +511,16 @@ export default { type: item.type == 1 ? "线上" : "线下", content: sHX(item.sysTypeId), status: - item.auditStatus == 0 - ? "未提交" - : item.auditStatus == 1 - ? "提交待审核" - : item.auditStatus == 2 - ? "通过" - : item.auditStatus == -1 - ? "拒绝" - : "-", + item.type == 2? + (item.status == 0 + ? "未提交" + : item.status == 1 + ? "待审核" + : item.status == 2 + ? "通过" + : item.status == -1 + ? "拒绝" + : "-"):(item.status == 1?'待审核':item.status == 2 ? "待审核":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'), creater: item.createName, time: item.createTime, msg: item.description || "-", diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 0efa77fc..a80deff8 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -245,7 +245,7 @@ + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups"> @@ -259,6 +259,8 @@ import { iframeUrl } from "../../api/method"; import { editCourseRecord } from "../../api/indexAudit"; import {useStore} from "vuex"; import dayjs from "dayjs"; +import {boeRequest} from "@/api/request"; +import {COURSE_AUDIT, OTHER_AUDIT} from "@/api/ThirdApi"; export default { name: "CoursereViewedN", @@ -405,7 +407,10 @@ export default { showAudit( value.record.createrId, value.record.creater, - value.record.offId + value.record.offId, + value.record.type, + value.record.id, + value.record.courseId ); }} > @@ -420,7 +425,10 @@ export default { showInvitationAudit( value.record.createrId, value.record.creater, - value.record.offId + value.record.offId, + value.record.type, + value.record.id, + value.record.courseId ) }}> 邀请审核 @@ -713,8 +721,8 @@ export default { // contentList11.find(e => e.dictCode == text)?.dictValue const searchList = () => { - console.log('searchParamsearchParamsearchParam', state.searchParam) - console.log('searchParamsearchParamsearchParam', Math.ceil(new Date(state.searchParam[0]).getTime())) + // console.log('searchParamsearchParamsearchParam', state.searchParam) + // console.log('searchParamsearchParamsearchParam', Math.ceiXXl(new Date(state.searchParam[0]).getTime())) let objn = { auditStatus: 1, // categoryId: state.valueproj, @@ -764,18 +772,20 @@ export default { let obj = { number: i + 1 + (state.currentPage - 1) * 10, name: item.name, + id: item.id, + courseId: item.courseId, type: item.type == 1 ? "线上" : "线下", content: sHX(item.sysTypeId), - status: - item.status == 0 - ? "未提交" - : item.status == 1 - ? "待审核" - : item.status == 2 - ? "通过" - : item.status == -1 - ? "拒绝" - : "-", + status:item.type == 2? + (item.status == 0 + ? "未提交" + : item.status == 1 + ? "待审核" + : item.status == 2 + ? "通过" + : item.status == -1 + ? "拒绝" + : "-"):(item.status == 1?'待审核':item.status == 2 ? "待审核":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'), change: "-", creater: item.createName, time: item.processTime, @@ -803,23 +813,32 @@ export default { state.currentPage = pagina; getFaceList(); }; - const showAudit = (createId, creater, offId) => { + const showAudit = (createId, creater, offId,type,id,courseId) => { console.log("参数",createId, creater, offId) state.courAuditModal = true; state.createId = createId; state.chooseCreater = creater; state.chooseOffId = offId; + state.type = type; + state.id = id; + state.courseId = courseId; {/* 获取当前课程的审核记录 */} getCourseRecord(offId); }; // 显示邀请审核弹框 - const showInvitationAudit = (createId, creater, offId) => { + const showInvitationAudit = (createId, creater, offId,type,id,courseId) => { console.log("参数",createId, creater, offId) state.courInvitationAuditModal = true; state.inviteReview.offcourseId = offId; state.inviteReview.teacherId = createId; state.inviteReview.teacherName = creater; + state.memberValue.value = ''; + state.memberValue.label = ''; + state.valueSuggInvitation=''; + state.type = type; + state.id = id; + state.courseId = courseId; }; // 关闭邀请审核弹框 const closeInvitationCourAuditModal = () => { @@ -833,19 +852,35 @@ export default { "teacherId": state.memberValue.value, "teacherName": state.memberValue.label }) - inviteAudit({ - "inviteContent": state.valueSuggInvitation, - "offcourseId": state.inviteReview.offcourseId, - "teacherId": state.memberValue.value, - "teacherName": state.memberValue.label - }).then((res) => { - console.log(res) - getFaceList(); - state.courInvitationAuditModal = false; - }).catch(err=>{ - console.log(err) - state.courInvitationAuditModal = false; - }) + if(state.type=='线下'){ + inviteAudit({ + "inviteContent": state.valueSuggInvitation, + "offcourseId": state.inviteReview.offcourseId, + "teacherId": state.memberValue.value, + "teacherName": state.memberValue.label + }).then((res) => { + console.log(res) + getFaceList(); + state.courInvitationAuditModal = false; + message.success("已经提交转审成功，请等待审核"); + }).catch(err=>{ + console.log(err) + state.courInvitationAuditModal = false; + }) + }else if (state.type=='线上'){ + boeRequest(OTHER_AUDIT,{ + auditId:state.id, + courseId:state.courseId, + teacherId:state.memberValue.value, + teacherName:state.memberValue.label, + remark:state.valueSuggInvitation, + }).then(()=>{ + getFaceList(); + state.courInvitationAuditModal = false; + message.success("已经提交转审成功，请等待审核"); + }) + } + } // 转审完成弹框 @@ -884,31 +919,49 @@ export default { message.error("请输入审核意见"); return; } + if(state.type=='线下'){ + courseAuditView({ + createId: state.createId, + createName: state.chooseCreater, + description: state.valueSugg, + offcourseId: state.chooseOffId, + pass: state.valuepass == "1" ? 1 : 0, + }).then((res) => { + console.log(res); + state.courAuditModal = false; + message.destroy(); + message.success("审核提交成功"); + state.valueSugg = null; + state.valuepass = "1"; + getFaceList(); + state.openDetailVisibie = false; + }) + .catch((err) => { + console.log(err); + message.destroy(); + message.warning("审核提交失败"); + state.valueSugg = null; + state.valuepass = "1"; + state.openDetailVisibie = false; + }); + }else if(state.type=='线上'){ + boeRequest(COURSE_AUDIT,{ + auditId:state.id, + courseId:state.courseId, + title:state.valueSugg, + remark:state.valueSugg, + pass:state.valuepass == "1" ? true : false, + }).then(()=>{ + state.courAuditModal = false; + message.destroy(); + message.success("审核提交成功"); + state.valueSugg = null; + state.valuepass = "1"; + getFaceList(); + state.openDetailVisibie = false; + }) + } - courseAuditView({ - createId: state.createId, - createName: state.chooseCreater, - description: state.valueSugg, - offcourseId: state.chooseOffId, - pass: state.valuepass == "1" ? 1 : 0, - }).then((res) => { - console.log(res); - state.courAuditModal = false; - message.destroy(); - message.success("审核提交成功"); - state.valueSugg = null; - state.valuepass = "1"; - getFaceList(); - state.openDetailVisibie = false; - }) - .catch((err) => { - console.log(err); - message.destroy(); - message.warning("审核提交失败"); - state.valueSugg = null; - state.valuepass = "1"; - state.openDetailVisibie = false; - }); }; onMounted(async () => { getFaceList(); diff --git a/src/views/examine/OnlineReviewed.vue b/src/views/examine/OnlineReviewed.vue index b1bf34c6..31e343bc 100644 --- a/src/views/examine/OnlineReviewed.vue +++ b/src/views/examine/OnlineReviewed.vue @@ -7,7 +7,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/examine/TobeOnlineReviewed.vue b/src/views/examine/TobeOnlineReviewed.vue index 960ee0bb..78325edc 100644 --- a/src/views/examine/TobeOnlineReviewed.vue +++ b/src/views/examine/TobeOnlineReviewed.vue @@ -7,7 +7,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/questionsanswers/QAManage.vue b/src/views/questionsanswers/QAManage.vue index bd93ede5..d8315647 100644 --- a/src/views/questionsanswers/QAManage.vue +++ b/src/views/questionsanswers/QAManage.vue @@ -17,7 +17,7 @@ frameborder="0" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/system/AudienceManage.vue b/src/views/system/AudienceManage.vue index 66c1f0c5..855b09ac 100644 --- a/src/views/system/AudienceManage.vue +++ b/src/views/system/AudienceManage.vue @@ -6,7 +6,7 @@ :src="`${BOE_URL}/pc/iframe/ugroup/manages`" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/system/DictManage.vue b/src/views/system/DictManage.vue index 2a031620..d705b9a6 100644 --- a/src/views/system/DictManage.vue +++ b/src/views/system/DictManage.vue @@ -6,7 +6,7 @@ :src="`${BOE_URL}/platform/sys/dwdictionary`" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/system/OldSystemManage.vue b/src/views/system/OldSystemManage.vue index 6630b670..61ecd492 100644 --- a/src/views/system/OldSystemManage.vue +++ b/src/views/system/OldSystemManage.vue @@ -6,7 +6,7 @@ :src="`${BOE_URL}/resource/index.html`" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" > diff --git a/src/views/system/ReadingClubManage.vue b/src/views/system/ReadingClubManage.vue index b18055e3..b2e83d9f 100644 --- a/src/views/system/ReadingClubManage.vue +++ b/src/views/system/ReadingClubManage.vue @@ -6,7 +6,7 @@ :src="`${BOE_URL}/train/manager/index.html`" name="myframe" security="restricted" - sandbox="allow-forms allow-scripts allow-same-origin allow-popups" + sandbox="allow-forms allow-downloads allow-scripts allow-same-origin allow-popups" >