diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js index 4e03e356..fc1aa0a1 100644 --- a/src/api/indexAudit.js +++ b/src/api/indexAudit.js @@ -16,4 +16,7 @@ export const courseListView = (obj) => http.post('/admin/offcourse/listReview', export const auditList = (obj) => http.post('/admin/project/auditList', obj) //项目审核 -export const auditView = (obj) => http.post('/admin/project/auditView', obj) \ No newline at end of file +export const auditView = (obj) => http.post('/admin/project/auditView', obj) + +//面授课审核 +export const courseAuditView = (obj) => http.post('/admin/offcourse/auditView', obj) \ No newline at end of file diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 6acf985d..5bca4104 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -385,6 +385,7 @@ import { queryFaceDetailById, editPlan } from "../../api/indexFace"; import dayjs from "dayjs"; import AssessmentList from "../drawers/ AssessmentList.vue"; // import { toDate } from "../../api/method"; +import { queryWorkDetailById } from "../../api/indexWork"; export default { name: "AddFaceteach", components: { @@ -465,6 +466,7 @@ export default { face: true, //面授传给配置作业的标识 chooseWork: null, //配置的work chooseWorkName: null, //配置的work名字 + chooseWorkId: null, //配置的work ID chooseMent: null, chooseMentName: null, assessmentVisible: false, @@ -486,7 +488,10 @@ export default { state.checkedAssessment = false; state.chooseMent = null; state.chooseWork = null; + state.chooseWorkId = null; + state.chooseWorkName = null; state.chooseCourse = null; + state.chooseCourseName = null; }; const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); @@ -501,7 +506,6 @@ export default { // 该页面显示同时 edit为true 时，发送查询请求, queryFaceTeach(); } - // queryFaceTeach(); }; const showDrawerSelFacet = () => { state.selfacetvisible = true; @@ -546,6 +550,7 @@ export default { state.inputV6 = result.afterStart; state.inputV7 = result.beforeEnd; state.fileList = JSON.parse(result.attach); + state.chooseWorkId = result.homeWorkId; // state.radioV1 = result. state.checkedHolidy = result.completeType == 1 @@ -568,6 +573,12 @@ export default { state.radioV1 = "2"; } state.checkedAssessment = result.evalFlag == 1 ? true : false; + if (state.chooseWorkId) { + queryWorkDetailById({ workId: state.chooseWorkId }).then((res) => { + state.chooseWork = res.data.data; + state.chooseWorkName = res.data.data.workName; + }); + } }); }; @@ -603,7 +614,7 @@ export default { evalFlag: state.checkedAssessment == true ? 1 : 0, evaluateId: state.chooseMent == null ? 0 : state.chooseMent.assessmentId, - homeWorkId: 0, + homeWorkId: state.chooseWorkId || 0, name: state.inputV1, noProjectMember: state.radioV2 == "1" ? 0 : 1, offcourseId: 0, @@ -613,6 +624,7 @@ export default { signWordFlag: 0, teacherId: 0, testId: 0, + teacher: state.inputV2, }; if (props.edit) { @@ -697,12 +709,15 @@ export default { const closeTagWork = () => { state.chooseWork = null; state.chooseWorkName = null; + state.chooseWorkId = null; }; const getWork = (value) => { console.log("getWork", value); state.chooseWork = value; state.chooseWorkName = value.workName; - console.log("getWorkName", value.workName); + state.chooseWorkId = value.workId; + + // console.log("getWorkName", value.workName); }; const handleChange = ({ file, fileList }) => { if (file.status !== "uploading") { diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 0f2a48df..7a8fa48c 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -368,8 +368,18 @@ export default { const cle = () => { console.log("xx", formState); + let obj = { + submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"), + submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"), + workEnclosureAddress: "", + workId: props.edit ? props.EditWorkId : 0, + workName: formState.workName, + workRequirement: formState.workRequirement, + }; if (props.face) { - ctx.emit("getWork", formState); + createWorkTask(obj).then((res) => { + ctx.emit("getWork", res.data.data); + }); } }; diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index b6e17ec3..7f4bb03f 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -100,30 +100,30 @@ 详情{{ showDetail ? "折叠" : "展开" }} - -
-
-
审核：
-
- - 通过 - 不通过 - -
-
-
-
审核意见：
-
- -
-
-
-
- -
+
+
+
审核：
+
+ + 通过 + 不通过 + +
+
+
+
审核意见：
+
+ +
+
+
+
+ + +
@@ -196,6 +196,7 @@ export default { const closeDrawer = () => { ctx.emit("update:ProjAuditvisible", false); state.valueSuggest = null; + state.valuePass = "1"; }; //获取项目信息 @@ -405,11 +406,22 @@ export default { // background-color: blue; display: flex; justify-content: center; + .can { + width: 130px; + height: 40px; + border-radius: 4px; + border: 1px solid #387df7; + color: #387df7; + background-color: #fff; + margin-right: 30px; + } .debtn { width: 130px; height: 40px; + background: #388be1; + border-radius: 8px; border: 0; - border-radius: 4px; + color: #ffffff; cursor: pointer; } } diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 56f0810c..bba0e0c1 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -86,16 +86,317 @@ + + +
+
+
+
+
+ 审核 +
+
+
+
+
审核：
+
+ + 通过 + 不通过 + +
+
+
+
审核意见：
+
+ +
+
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+ + 预览 +
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+ 课程名称： +
+
+
fefewf
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ 封面图： +
+
fefw
+
+
+
+
+ +
+ 目标人群： +
+
+
+
+
+
+
+ 课程价值： +
+
+
+
+
+
+
+
+ +
+ 资源归属： +
+
+
+
+
+
+
+
+ +
+ 内容分类： +
+
+
+
+
+
+
+ 场景： +
+
+
+
+
+
+
+ 内容标签： +
+
+
+
+
+
+
+
+ asterisk +
+ 授课教师： +
+
+
+
+
+
+
+ 课程简介： +
+
+
+
+
+
+
+ 附件 +
+
+ +
+
+ enclosure +
+ 添加附件 +
+ + + 支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip + +
+
+
+
+
+ +
+
+
+ {{ item.name }} +
+ +
+
+
+
上传完成
+
+
+ 100% +
+
+
+
+
+ + 删除 + +
+
+
+
+
+
+
+
+ 课程大纲 +
+
+
+ + +
+
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+