From 0771f610af6d1f2f00bb2c99cd83b962e2c4cdf7 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 8 Aug 2023 17:18:11 +0800 Subject: [PATCH 01/17] ---fix bug --- src/components/NavLeft.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 0951a440..8fb04ba5 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -438,7 +438,6 @@ /> 旧版管理员界面 -
From dbdf3fb27c5f1f2da988af825d083a12454e47aa Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 8 Aug 2023 18:52:13 +0800 Subject: [PATCH 02/17] ---fix bug --- src/components/NavLeft.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 8fb04ba5..d0b60391 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -430,7 +430,7 @@ - +
Date: Fri, 25 Aug 2023 11:55:22 +0800 Subject: [PATCH 03/17] fix bug --- src/components/NavLeft.vue | 4 ++-- src/views/courselibrary/CoursewareManage.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index f5c88b87..4f2649ee 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -437,14 +437,14 @@ src="../assets/images/navleft/review.png" />
- 旧版管理员界面 + 旧版管理员界面
业务支援读书会管理 diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index b033b7f8..7d7ffd5c 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4560,7 +4560,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(); @@ -4571,7 +4571,7 @@ export default defineComponent({ state.selectTime = ""; state.currentPage2 = 1; state.tableDataTotal2 = []; - state.pageSize222 = 1 + state.pageSize222 = 10 state.currentPage1 = 1 getTableDate(); getTableDate3(); From 2e19f357a56eaa39790ab0d3fb2dc93472b14516 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 25 Aug 2023 14:52:40 +0800 Subject: [PATCH 04/17] ---fix bug --- src/components/NavLeft.vue | 8 ++++---- src/components/drawers/AddLevelImportStu.vue | 2 +- src/components/drawers/CheckVote.vue | 4 ++-- src/components/drawers/EvList.vue | 2 +- src/views/examine/CourseReviewedN.vue | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 4f2649ee..623bdf1b 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -437,14 +437,14 @@ src="../assets/images/navleft/review.png" />
- 旧版管理员界面 + 旧版管理员界面
业务支援读书会管理 @@ -529,7 +529,7 @@ 问答 - 旧版 + 旧版 业务 @@ -555,7 +555,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 2a8e2f4e..e41bfb3e 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -40,7 +40,7 @@ :data="{ targetId: Number(courseId), type: courseType, - userId: userInfo.id, + userId: userInfo.userId, userName: userInfo.realName, }" :showUploadList="false" 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/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/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 0efa77fc..8b0bc78b 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -714,7 +714,7 @@ export default { const searchList = () => { console.log('searchParamsearchParamsearchParam', state.searchParam) - console.log('searchParamsearchParamsearchParam', Math.ceil(new Date(state.searchParam[0]).getTime())) + console.log('searchParamsearchParamsearchParam', Math.ceiXXl(new Date(state.searchParam[0]).getTime())) let objn = { auditStatus: 1, // categoryId: state.valueproj, @@ -885,6 +885,8 @@ export default { return; } + + courseAuditView({ createId: state.createId, createName: state.chooseCreater, 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 05/17] ---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" > From 8a396d412a74709acbc03e17dc612eff98c345dc Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 14:02:34 +0800 Subject: [PATCH 06/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 0eb12bde..c085af0d 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -715,8 +715,8 @@ export default { // contentList11.find(e => e.dictCode == text)?.dictValue const searchList = () => { - console.log('searchParamsearchParamsearchParam', state.searchParam) - console.log('searchParamsearchParamsearchParam', Math.ceiXXl(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, @@ -930,7 +930,7 @@ export default { auditId:state.id, courseId:state.courseId, title:state.description, - remark:state.description, + remark:state.valueSugg, pass:state.valuepass == "1" ? true : false, }).then(()=>{ state.courAuditModal = false; From 947165a20367e09002226498502460d058d5d99d Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 14:21:16 +0800 Subject: [PATCH 07/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index c085af0d..3623f10f 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -766,6 +766,8 @@ 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.type == 2? @@ -835,7 +837,7 @@ export default { "teacherId": state.memberValue.value, "teacherName": state.memberValue.label }) - if(state.type==2){ + if(state.type=='线下'){ inviteAudit({ "inviteContent": state.valueSuggInvitation, "offcourseId": state.inviteReview.offcourseId, @@ -849,7 +851,7 @@ export default { console.log(err) state.courInvitationAuditModal = false; }) - }else if (state.type==1){ + }else if (state.type=='线上'){ boeRequest(OTHER_AUDIT,{ auditId:state.id, courseId:state.courseId, @@ -900,7 +902,7 @@ export default { message.error("请输入审核意见"); return; } - if(state.type==2){ + if(state.type=='线下'){ courseAuditView({ createId: state.createId, createName: state.chooseCreater, @@ -925,11 +927,11 @@ export default { state.valuepass = "1"; state.openDetailVisibie = false; }); - }else if(state.type==1){ + }else if(state.type=='线上'){ boeRequest(COURSE_AUDIT,{ auditId:state.id, courseId:state.courseId, - title:state.description, + title:state.valueSugg, remark:state.valueSugg, pass:state.valuepass == "1" ? true : false, }).then(()=>{ From 36088a0ce82a1b872e6b8824d29c9094f3d79219 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 14:36:51 +0800 Subject: [PATCH 08/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 3623f10f..87e63f1e 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -407,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 ); }} > @@ -422,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 ) }}> 邀请审核 @@ -807,23 +813,29 @@ 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.type = type; + state.id = id; + state.courseId = courseId; }; // 关闭邀请审核弹框 const closeInvitationCourAuditModal = () => { From 87b364703b396b447d7da32834d7e37bb923c725 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 14:41:55 +0800 Subject: [PATCH 09/17] ---fix bug --- src/api/ThirdApi.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 46347d69..0ef747a5 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -16,6 +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 = "/xboe/m/course/manage/audit post formData"; -export const OTHER_AUDIT = "/xboe/m/course/audit/appoint post formData"; +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 From d8945dec0af8a1ff5adf4d5d1fce949f72313765 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 14:54:15 +0800 Subject: [PATCH 10/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 87e63f1e..7562b82a 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -785,7 +785,7 @@ export default { ? "通过" : item.status == -1 ? "拒绝" - : "-"):(item.status == 1?'未审核':item.status == 2 ? "拒绝":item.status == 9?'通过':'-'), + : "-"):(item.status == 1?'未审核':item.status == 2 ? "拒绝":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'), change: "-", creater: item.createName, time: item.processTime, From 75e3105ee59c461b8be3d1d0d46abfe8c602b9b7 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 15:31:59 +0800 Subject: [PATCH 11/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 7562b82a..d78647a7 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -785,7 +785,7 @@ export default { ? "通过" : item.status == -1 ? "拒绝" - : "-"):(item.status == 1?'未审核':item.status == 2 ? "拒绝":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'), + : "-"):(item.status == 1?'待审核':item.status == 2 ? "待审核":item.status == 5 ? "通过":item.status == 3?'拒绝':item.status == 9?'通过':'-'), change: "-", creater: item.createName, time: item.processTime, From 60c32a717413bf561ff64df94d48ae10f26adc33 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 15:39:13 +0800 Subject: [PATCH 12/17] ---fix bug --- src/views/examine/CourseReviewed.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) 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 || "-", From 44aadbb9f6c03f532f55d9cf8bc840d7d4c70b2f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 15:55:01 +0800 Subject: [PATCH 13/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index d78647a7..7e3d4349 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -833,6 +833,9 @@ export default { 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; @@ -859,6 +862,7 @@ export default { console.log(res) getFaceList(); state.courInvitationAuditModal = false; + message.error("已经提交转审成功，请等待审核"); }).catch(err=>{ console.log(err) state.courInvitationAuditModal = false; @@ -869,10 +873,11 @@ export default { courseId:state.courseId, teacherId:state.memberValue.value, teacherName:state.memberValue.label, - remark:state.description, + remark:state.valueSuggInvitation, }).then(()=>{ getFaceList(); state.courInvitationAuditModal = false; + message.error("已经提交转审成功，请等待审核"); }) } From 44221e8006947aaa6fc7e514f983fceb064190b5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 15:55:10 +0800 Subject: [PATCH 14/17] ---fix bug --- src/views/examine/CourseReviewedN.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 7e3d4349..1671a610 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -835,7 +835,7 @@ export default { state.inviteReview.teacherName = creater; state.memberValue.value = ''; state.memberValue.label = ''; - state.valueSuggInvitation='', + state.valueSuggInvitation=''; state.type = type; state.id = id; state.courseId = courseId; From dfdb67f87d9e929197989906ecc98200fed3697b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 15:58:24 +0800 Subject: [PATCH 15/17] ---fix bug --- src/components/NavLeft.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 24ba55e8..801370ca 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -528,7 +528,7 @@ 问答 - 旧版 + 旧版 业务 From f95a83270b27a7d84c9e4b7e8beb25ad1a0559a3 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 16:10:13 +0800 Subject: [PATCH 16/17] ---fix bug --- src/components/NavLeft.vue | 2 +- src/views/examine/CourseReviewedN.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 801370ca..8f2dc477 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -528,7 +528,7 @@ 问答 - 旧版 + 旧版 业务 diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 1671a610..a80deff8 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -862,7 +862,7 @@ export default { console.log(res) getFaceList(); state.courInvitationAuditModal = false; - message.error("已经提交转审成功，请等待审核"); + message.success("已经提交转审成功，请等待审核"); }).catch(err=>{ console.log(err) state.courInvitationAuditModal = false; @@ -877,7 +877,7 @@ export default { }).then(()=>{ getFaceList(); state.courInvitationAuditModal = false; - message.error("已经提交转审成功，请等待审核"); + message.success("已经提交转审成功，请等待审核"); }) } From 114145a2db6d207b1c93beaf78bfd3acbdf087ef Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 27 Aug 2023 16:30:01 +0800 Subject: [PATCH 17/17] ---fix bug --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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------------"); // 监听关闭浏览器