diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 9c888fda..8d72a470 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -215,7 +215,7 @@
- +
@@ -317,6 +317,22 @@ export default { localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; + const closeDrawer1 = () => { + ctx.emit("update:addactiveVisible", false); + ctx.emit("update:edit", false); + state.radioV1 = ""; + state.inputV1 = ""; + state.inputV2 = ""; + state.inputV3 = ""; + state.inputV4 = ""; + state.inputV5 = ""; + state.inputV6 = ""; + state.textV1 = ""; + state.textV2 = ""; + state.time = ""; + localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); + } const queryActive = () => { api .getActivity(props.EditActiveId) @@ -475,6 +491,7 @@ export default { ...toRefs(state), afterVisibleChange, closeDrawer, + closeDrawer1, cloradio1, updateActivityInfo, }; diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index b09e50f3..2bba79f1 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -64,7 +64,7 @@
- +
@@ -158,6 +158,14 @@ export default { localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); }; + const closeDrawer1 = () => { + ctx.emit("update:adddiscussVisible", false); + ctx.emit("update:edit", false); + state.inputV1 = ""; + state.textV1 = ""; + localStorage.setItem("stageId", props.chooseStageId); + localStorage.setItem("chapterId", props.isactive); + } const queryDiscuss = () => { if (props.edit) { //编辑讨 @@ -264,6 +272,7 @@ export default { ...toRefs(state), afterVisibleChange, closeDrawer, + closeDrawer1, updateDiscussInfo, checkRadio, }; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index fadb1caa..e28cf172 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -134,10 +134,18 @@ 面授时长：
- + > 分钟
@@ -172,31 +180,30 @@
开始前： + :min="0" + :max="300" + :precision="0" + style=" + width: 100px; + height: 32px; + border-radius: 8px; + overflow: hidden; " + v-model:value="before" + > 分钟
开始后： 分钟
@@ -233,7 +240,7 @@
允许项目内人员临时到场参加 - 允许项目外人员临时到场参加 + 允许项目外人员临时到场参加
@@ -331,7 +338,7 @@
- +
@@ -348,7 +355,7 @@ import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"; import { message } from "ant-design-vue"; import { getMemberInfo } from "@/api/index1"; import { debounce } from "lodash-es"; -import { queryFaceDetailById, editPlan } from "../../api/indexFace"; +import { queryFaceDetailById,editPlan } from "../../api/indexFace"; import dayjs from "dayjs"; import AssessmentList from "../drawers/ AssessmentList.vue"; // import { toDate } from "../../api/method";、 @@ -432,8 +439,8 @@ export default { courseName: "", duration:null, address: null, - beforeStartValue:20, - afterStartValue:10, + before:null, + afterStartValue:null, description: "", chooseTime: [], fileList: [], @@ -443,7 +450,10 @@ export default { EditWorkId:null, assessmentVisible:false, needEval:false, - + onlySign:false, + completeLeave:false, + innerPersion:false, + outPersion:false, }); const clear = () => { @@ -451,21 +461,21 @@ export default { state.memberValue = null; state.duration = null; state.address = null; - state.beforeStart = 0; - state.afterStartValue =0; + state.before=null; + state.afterStartValue=null; state.chooseTime = []; state.description =""; state.onlySign =false; state.completeLeave =false; - state.projectMember =false; - state.noProjectMember =false; + state.innerPersion =false; + state.outPersion =false; state.chooseCourse = null; state.EditTestId =null; state.assessmentId=null; state.EditWorkId=null; state.EditEvalId=null; state.applyFlag=""; - console.log("state.afterStart",state.afterStartValue); + state.needEval=false; }; const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); @@ -512,7 +522,7 @@ export default { //查询面授 const queryFaceTeach = () => { - console.log("props.EditFaceI========d",props.EditFaceId); + queryFaceDetailById(props.EditFaceId).then((res) => { console.log("获取到了面授课开课详情", res.data.data); let result = res.data.data; @@ -529,63 +539,72 @@ export default { state.chooseTime = []; } state.address = result.address; - state.beforeStart = result.beforeStart; + state.before =result.beforeStart; state.afterStartValue = result.afterStart; - console.log("编辑========",state.afterStartValue); state.fileList = JSON.parse(result.attach); state.EditWorkId = result.homeWorkId; state.onlySign = result.completeType.split(",")[0]=="1"?true:false; state.completeLeave =result.completeType.split(",")[1]=="1"?true:false; state.chooseCourse =result.offcourseId; - state.projectMember = result.projectMember.split(",")[0]=="1"?true:false; - state.noProjectMember = result.projectMember.split(",")[1]=="1"?true:false; + state.innerPersion = result.projectMember.split(",")[0]=="1"?true:false; + state.outPersion = result.projectMember.split(",")[1]=="1"?true:false; state.EditTestId = result.testId; state.EditWorkId=result.homeWorkId; state.assessmentId =result.evaluateId; + state.needEval = result.evaluateId; + + console.log("state=======",state); }); }; + // 点击取消按钮 + const exitAdd = () => { + closeDrawer(); + } + //新建或编辑面授 // 新增任务 const updateFaceTeach = () => { - console.log("v",state.beforeStart,"v",state.afterStartValue,"v", - state.applyFlag,"v",state.evalFlag,"v",state.completeType,"state.address",state.address); + if ( - /* state.courseName == "" || - state.chooseCourse == null ||s + state.chooseCourse == null || state.memberValue == "" || state.chooseTime == [] || state.duration == "" || - */ state.address == "" ) { message.destroy(); return message.warning("请输入必填字段"); } else { + let type =state.onlySign ? "1,":"0,"; + let t = state.completeLeave?"1":"0"; + let p=state.innerPersion?"1,":"0,"; + let p1=state.outPersion?"1":"0"; let obj = { teacherId:state.memberValue.value, teacher:state.memberValue.label, address:state.address, applyFlag: state.applyFlag, attach: JSON.stringify(state.fileList), - afterStart:state.afterStartValue ||0, - beforeStart:state.beforeStart, + afterStart:state.afterStartValue || 0, + beforeStart:state.before || 0, beginTime: parseInt( new Date(state.chooseTime[0].$d).getTime() / 1000), - completeType: state.onlySign? "1,":"0," + state.completeLeave?"1":"0", + completeType:type.concat(t), description: state.description, endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000), evalFlag:state.needEval?1:0, evaluateId:state.assessmentId, homeWorkId: state.EditWorkId, name: state.courseName, - projectMember:state.innerPersion?"1,":"0," + state.outPerson?"1":"0", + projectMember:p.concat(p1), offcourseId:state.chooseCourse, offcoursePlanId:props.EditFaceId >0 ? props.EditFaceId : 0, testId: state.EditTestId }; - + console.log("obj============",obj,"6"+"9"); + editPlan(obj) .then((res) => { console.log("更新任务s's"); @@ -748,6 +767,7 @@ export default { afterVisibleChange, closeDrawer, updateFaceTeach, + exitAdd, updateTask, clear, handleChange, diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 47316a2e..0c372be7 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -405,6 +405,12 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); }); } + + + //if(state.addOnlineList.Target==undefined){ + // closeDrawer(); + //} + }; //搜索在线列表 const searchList = ()=> { diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index ab77eec8..ec3d36f3 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -435,7 +435,13 @@ export default { state.selectedRows.forEach((item) => { let origin = JSON.parse(props.chooseProjectList); console.log("ccxx", origin); - + if(origin==null){ + closeSameModal(); + closeDrawer(); + message.destroy(); + message.info("添加成功"); + return; + } if (origin.length == 0) { //可以直接添加到任务列表里 updateTask(item); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 20fe558a..f4276b2f 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -16,7 +16,7 @@ /> -
+
+ 确定
+ + +
+
+
+
+ + + +
+
+ +
+
+ + + +
+
+ +
+ + + +
+
+
+
+ 取消 + 确定 +
+ + +
diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue index 22e5c839..58f7d382 100644 --- a/src/components/drawers/UnlockMode.vue +++ b/src/components/drawers/UnlockMode.vue @@ -72,8 +72,8 @@
- - + +
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 0e5172e6..6ac3813f 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -458,6 +458,11 @@
-
{ let objn = { auditStatus: 0, - categoryId: 0, + // categoryId: 0, createName: state.valuecreater, name: state.valuename, pageNo: state.currentPage, diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index ff0ff250..6ebbb23d 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -530,7 +530,7 @@ export default { let objn = { auditStatus: 1, // beginTime: 0, - categoryId: 0, + // categoryId: 0, createName: state.valuecreater, // endTime: 0, name: state.valuename, diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index d3be222a..953cd96f 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -174,7 +174,7 @@
- +
{{ styTitle }}
@@ -1495,6 +1495,7 @@ export default { }); }; + const showAddStu = () => { state.AddSvisible = true; }; @@ -2562,6 +2563,7 @@ export default { width: 238px; height: 40px; border-radius: 8px; + padding-left: 12px; input { border: none; outline: none;