From 0938845250e2dd8d3603bb10bdb0976b514b7df1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 25 Aug 2023 16:10:03 +0800 Subject: [PATCH] ---fix bug --- src/api/ThirdApi.js | 2 + src/components/Modals/addOnlineCourse.vue | 2 +- src/components/drawers/CheckAnsware.vue | 2 +- src/components/drawers/CreateOnline.vue | 2 +- src/components/drawers/SelectTest.vue | 2 +- src/views/article/ArticleManage.vue | 2 +- src/views/case/CaseManage.vue | 2 +- src/views/courselibrary/CourseManage.vue | 2 +- src/views/courselibrary/OnlineManage.vue | 2 +- src/views/examination/ExaminationCenter.vue | 2 +- src/views/examination/PaperManage.vue | 2 +- src/views/examination/QuestionManage.vue | 2 +- src/views/examine/CourseReviewedN.vue | 132 ++++++++++++-------- src/views/examine/OnlineReviewed.vue | 2 +- src/views/examine/TobeOnlineReviewed.vue | 2 +- src/views/questionsanswers/QAManage.vue | 2 +- src/views/system/AudienceManage.vue | 2 +- src/views/system/DictManage.vue | 2 +- src/views/system/OldSystemManage.vue | 2 +- src/views/system/ReadingClubManage.vue | 2 +- 20 files changed, 102 insertions(+), 68 deletions(-) diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 0bc2c9bc..6bda8ebf 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -12,4 +12,6 @@ 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 COURSE_AUDIT = "/xboe/m/course/manage/audit post formData"; +export const OTHER_AUDIT = "/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/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/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/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/case/CaseManage.vue b/src/views/case/CaseManage.vue index 58b58328..ffc26fcd 100644 --- a/src/views/case/CaseManage.vue +++ b/src/views/case/CaseManage.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/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/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 8b0bc78b..0eb12bde 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", @@ -766,16 +768,16 @@ export default { name: item.name, 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 == 9?'通过':'-'), change: "-", creater: item.createName, time: item.processTime, @@ -833,19 +835,33 @@ 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==2){ + 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; + }) + }else if (state.type==1){ + boeRequest(OTHER_AUDIT,{ + auditId:state.id, + courseId:state.courseId, + teacherId:state.memberValue.value, + teacherName:state.memberValue.label, + remark:state.description, + }).then(()=>{ + getFaceList(); + state.courInvitationAuditModal = false; + }) + } + } // 转审完成弹框 @@ -884,33 +900,49 @@ export default { message.error("请输入审核意见"); return; } + if(state.type==2){ + 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==1){ + boeRequest(COURSE_AUDIT,{ + auditId:state.id, + courseId:state.courseId, + title:state.description, + remark:state.description, + 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" >