From 71c06be5d54918385cf4bead72c81b65390c411a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 29 Nov 2022 15:25:21 +0800 Subject: [PATCH 1/8] =?UTF-8?q?--=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=20=E5=8E=BB=E6=8E=89categoryId=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examine/CourseReviewed.vue | 2 +- src/views/examine/CourseReviewedN.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue index 6095d83b..86d08a4b 100644 --- a/src/views/examine/CourseReviewed.vue +++ b/src/views/examine/CourseReviewed.vue @@ -187,7 +187,7 @@ export default { const getList = () => { 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, From e8afe1440e50feca9692092eda682259c5bb3559 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 29 Nov 2022 15:31:53 +0800 Subject: [PATCH 2/8] =?UTF-8?q?--=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=20=E9=9D=A2=E6=8E=88=E8=AF=BE=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 0a9e52fb..ba3523a8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -193,6 +193,7 @@ v-model:checked="checked" :value="1" @click="bs_hShow" + disabled > 线上 From 0083d3b4d98bbf4535782059f04b939458c4de91 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 29 Nov 2022 15:36:15 +0800 Subject: [PATCH 3/8] =?UTF-8?q?--=E5=BE=85=E5=AE=A1=E6=A0=B8=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index ba3523a8..0a9e52fb 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -193,7 +193,6 @@ v-model:checked="checked" :value="1" @click="bs_hShow" - disabled > 线上 From a6fefb61bf4a4a78deb08902ca66cae36fe00a99 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 29 Nov 2022 15:53:47 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 98 ++++++++++++++----------- 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index fadb1caa..cc3cb058 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 @@
允许项目内人员临时到场参加 - 允许项目外人员临时到场参加 + 允许项目外人员临时到场参加
@@ -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,67 @@ 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 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"); From 80fcf394a0d4011075ffc105ace7d324d0ed2861 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 29 Nov 2022 16:03:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E7=BC=96=E8=BE=91=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 8 ++- src/components/drawers/AddOnline.vue | 6 ++ src/components/drawers/AddProject.vue | 8 ++- src/components/drawers/AddTest.vue | 78 ++++++++++++++++++++++++- src/components/drawers/UnlockMode.vue | 4 +- 5 files changed, 99 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index fadb1caa..00ce0aee 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -331,7 +331,7 @@
- +
@@ -545,6 +545,11 @@ export default { }); }; + // 点击取消按钮 + const exitAdd = () => { + closeDrawer(); + } + //新建或编辑面授 // 新增任务 const updateFaceTeach = () => { @@ -748,6 +753,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..bdbd2677 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..8f1858e0 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -32,7 +32,9 @@ 外部考试 + 确定 + + +
+
+
+
+ + + +
+
+ +
+
+ + + +
+
+ +
+ + + +
+
+
+
+ 取消 + 确定 +
+ + +
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 @@
- - + +
From eee5a7f9633df40200c0076170ab27ed9f095a22 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 29 Nov 2022 16:45:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?style:=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=BE=91=E4=BB=BB=E5=8A=A1=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 19 ++++++++++++++++++- src/components/drawers/AddDiscuss.vue | 11 ++++++++++- src/views/learningpath/LevelAddDetail.vue | 3 ++- 3 files changed, 30 insertions(+), 3 deletions(-) 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/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index d3be222a..0975ce3d 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; }; From b7916066082018e0c0c18674f7efb6936b10c011 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 29 Nov 2022 17:42:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?style:=E5=88=87=E6=8D=A2=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 0975ce3d..953cd96f 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -2563,6 +2563,7 @@ export default { width: 238px; height: 40px; border-radius: 8px; + padding-left: 12px; input { border: none; outline: none; From 3c306e1f62f65dbc72315bc301e595b4ce70dd45 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 29 Nov 2022 18:18:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?style:=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 6 +++--- src/components/drawers/AddTest.vue | 2 +- src/views/courselibrary/CoursewareManage.vue | 22 +++++++++++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index bdbd2677..0c372be7 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -407,9 +407,9 @@ export default { } - if(state.addOnlineList.Target==undefined){ - closeDrawer(); - } + //if(state.addOnlineList.Target==undefined){ + // closeDrawer(); + //} }; //搜索在线列表 diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 8f1858e0..f4276b2f 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -16,7 +16,7 @@ />
-
+