diff --git a/src/api/indexEval.js b/src/api/indexEval.js index 396d5b15..5bb05bc8 100644 --- a/src/api/indexEval.js +++ b/src/api/indexEval.js @@ -71,7 +71,13 @@ export const queryEvaluationDetailById = (obj) => "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", }, }); - + export const queryEvaluationMessageById = (obj) => + http.post("/evaluation/queryEvaluationMessageById", obj, { + headers: { + token: "123", + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + }, + }); //修改测评信息 export const updateEvaluation = (obj) => http.post("/evaluation/updateEvaluation", obj); diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index b98f3465..a5e57e88 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -237,14 +237,14 @@ export default { .then((res) => { message.destroy() message.success("获取测评信息成功"); - state.inputV1 = res.data.data.evaluationName - state.evaluationTypeName = res.data.data.evaluationTypeName + state.inputV1 = res.data.data.evaluationName; + state.evaluationTypeName = res.data.data.evaluationTypeName; state.evaluationTypeId = res.data.data.evaluationTypeId; state.time = res.data.data.evaluationStartTime ? [ dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), ] : undefined; - state.description = res.data.data.evaluationExplain + state.description = res.data.data.evaluationExplain; }) .catch((err) => { message.destroy() diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 0d4e52ea..4e3f9e45 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -352,11 +352,9 @@
已选考试:
-
+
- {{ - testName - }} + {{testName}}
@@ -396,10 +394,15 @@ import { debounce } from "lodash-es"; import { queryFaceDetailById, editPlan } from "../../api/indexFace"; import dayjs from "dayjs"; import AssessmentList from "../drawers/ AssessmentList.vue"; + // import { toDate } from "../../api/method";、 import { addTempTask } from "../../api/indexTaskadd"; import ProjectManager from "@/components/project/ProjectManagerNew"; +import { detail } from "../../api/indexCourse"; +import { queryAppraiseDetailById } from "../../api/indexInvist"; +import {queryWorkDetailById} from "@/api/indexWork"; +import {queryExaminationDetailById} from "@/api/indexExam"; export default { name: "AddFaceteach", components: { @@ -495,6 +498,7 @@ export default { EditTestId: null, EditWorkId: null, workName: null, + testName: null, assessmentVisible: false, needEval: false, onlySign: false, @@ -588,7 +592,6 @@ export default { state.before = result.beforeStart; state.afterStartValue = result.afterStart; state.fileList = JSON.parse(result.attach); - state.EditWorkId = result.homeWorkId; state.onlySign = result.completeType.split(",")[0] == "1" ? true : false; state.completeLeave = @@ -602,7 +605,19 @@ export default { state.EditWorkId = result.homeWorkId; state.assessmentId = result.evaluateId; state.needEval = result.evaluateId; + detail({offcourseId:result.offcourseId}).then((res)=>{ + state.chooseCourseName =res.data.data.name; + }); + queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{ + state.assessmentName =res.data.data.assessmentName; + }); + queryWorkDetailById({workId:result.homeWorkId}).then((res)=>{ + state.workName = res.data.data.workName; + }); + queryExaminationDetailById({ examinationId: result.testId }).then((res)=>{ + state.testName = res.data.data.examinationName; + }); console.log("state=======", state); }); }; diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index d7f61f40..9c3da18d 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -338,6 +338,7 @@ import { fileUp } from "../../api/indexEval"; import AssessmentList from "../drawers/ AssessmentList.vue"; import { debounce } from "lodash-es"; import ProjectManager from "@/components/project/ProjectManagerNew"; +import { queryAppraiseDetailById } from "../../api/indexInvist"; // import { useRouter } from "vue-router"; function getBase64(img, callback) { @@ -519,6 +520,9 @@ export default { value: res.data.data.liveTeacherId || "", label: res.data.data.liveTeacherName || "", }; + queryAppraiseDetailById({assessmentId:res.data.data.assessmentId}).then((res)=>{ + state.assessmentName =res.data.data.assessmentName; + }); }) .catch(() => { //message.error(`查询失败`); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index cce4e1b8..e7573cb8 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -554,6 +554,7 @@ export default { console.log("formState.testName", state.testName); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); + state.addLoading = false; resetForm(); }; const closeDrawer2 = () => { @@ -561,6 +562,7 @@ export default { ctx.emit("update:edit", false); ctx.emit("update:addtestVisible", false); resetForm(); + state.addLoading = false; }; const afterVisibleChange = () => { console.log("props", props); @@ -597,7 +599,6 @@ export default { state.paperName = res.data.data.examinationTestName; // state.paperId= state.paperId = res.data.data.examinationTestId; - state.paperName = res.data.data.examinationTestName; if ( res.data.data.examinationEndTime && res.data.data.examinationStartTime @@ -617,6 +618,7 @@ export default { }; const updateTest = () => { //state.addLoading = true;updateTask + let obj = { examinationDuration: formState.examinationDuration, examinationEndTime: dayjs(formState.choosedTime[1]).format( @@ -656,7 +658,7 @@ export default { message.destroy(); return message.warning("请输入考试时长"); } - + state.addLoading = true; if (props.edit) { // 编辑任务 updateExamination(obj) @@ -685,6 +687,8 @@ export default { state.EditTestId = res.data.data.examinationId; if (props.faceLevel) { state.EditTestId = res.data.data.examinationId; + + closeDrawer(); } else { if (props.isLevel == 1) { let editObj1 = { @@ -701,7 +705,7 @@ export default { console.log("props.edit", props.edit); message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); - state.addLoading = false; + closeDrawer(); }) .catch(() => {