From b9bfcd6a8cefbdb86f7088cd139ca07ca80f9b96 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 20 Dec 2022 10:51:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AF=95=E5=8D=B7=E9=80=89=E6=8B=A9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=90=8E=E6=9C=AA=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 1607 +++++++++++++------------- src/components/drawers/AddTest.vue | 1527 ++++++++++++------------ 2 files changed, 1531 insertions(+), 1603 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 25549958..fc8eadc6 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -1,48 +1,34 @@ \ No newline at end of file diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 38ac3dd1..3315950c 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -1,23 +1,15 @@ \ No newline at end of file From a2dce95b4fcc449ecb7c1c5a5ccb69418287363f Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 20 Dec 2022 10:58:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E5=90=8C=E9=98=B6=E6=AE=B5=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8C=E4=B8=80=E5=9C=A8=E7=BA=BF=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddInvist.vue | 897 ++++++++++++++------------- 1 file changed, 452 insertions(+), 445 deletions(-) diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index ddb7666f..3bb6dc62 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -1,472 +1,479 @@ From dd3a40320cb82ef787bfdf545ddb81a5a2837218 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 20 Dec 2022 12:27:32 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E7=99=BD=E5=B1=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courselibrary/components/seeModal.vue | 1593 ++++++++--------- 1 file changed, 768 insertions(+), 825 deletions(-) diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index 1d9971d6..877cb44f 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -1,214 +1,154 @@ From 12a5829d3019c71553f891dce961c4046f4c1b2a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 13:28:45 +0800 Subject: [PATCH 4/7] -- bug --- src/components/student/CommonStudent.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 57aca2bc..72966904 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -505,6 +505,7 @@ watch(visiable, () => { stuSelectKeys.value = [] orgSelectKeys.value = [] auditSelectKeys.value = [] + stuData.value = [] selectsData.value = { stageId: '', studentList: [], From b971e9eca86196dec09ad700cfa8af2365fd4b25 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 13:55:01 +0800 Subject: [PATCH 5/7] -- bug --- src/components/student/CommonStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index c5895a47..5b03382f 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -362,7 +362,7 @@ const { loading: audiLoading, total: audiTotal } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, { - init: false, + init: true, result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})), totalPage: res => res.result.totalPage, total: res => res.result.totalElement From febf4774eea1c95782a9f9ae4c7f3685969675ff Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 20 Dec 2022 14:16:03 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 12d12538..6f29ed3b 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -495,6 +495,7 @@ export default { innerPersion: false, outPersion: false, assessmentName: null, + isClick: false }); const clear = () => { state.courseName = ""; @@ -643,6 +644,12 @@ export default { message.destroy(); return message.warning("请输入必填字段"); } else { + if(state.isClick){ + message.destroy(); + message.error("请勿频繁点击") + return + } + state.isClick = true; let type = state.onlySign ? "1," : "0,"; let t = state.completeLeave ? "1" : "0"; let p = state.innerPersion ? "1," : "0,"; @@ -681,10 +688,12 @@ export default { // message.success(`添加成功`); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; closeDrawer(); }) .catch((e) => { console.log(e); + state.isClick = false; message.destroy(); message.error(`添加失败`); }); From 4442ca956d7be9d441ebd221ac4b54601af0f97e Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 20 Dec 2022 15:35:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A2=91=E7=B9=81=E7=82=B9=E5=87=BB=E5=A2=9E=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 12 +++++++++++ src/components/drawers/AddCase.vue | 25 +++++++++++++++++++++ src/components/drawers/AddHomework.vue | 19 ++++++++++++++++ src/components/drawers/AddInvist.vue | 30 ++++++++++++++++++++++++++ src/components/drawers/AddLive.vue | 15 ++++++++++++- src/components/drawers/AddOnline.vue | 29 +++++++++++++++++++++++++ src/components/drawers/AddRef.vue | 19 ++++++++++++++-- 7 files changed, 146 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index a8987e13..17cc3de3 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -317,6 +317,7 @@ export default { textV2: "", radioV1: "", time: "", + isClick: false }); const closeDrawer = () => { ctx.emit("update:addactiveVisible", false); @@ -464,6 +465,13 @@ export default { return message.warning("请输入活动地址"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + let obj = { activityAddress: state.inputV3, //活动地址 activityDuration: state.inputV2, //活动时长 @@ -489,10 +497,12 @@ export default { ctx.emit("changeData", false); message.destroy(); message.success("更新成功"); + state.isClick = false; }) .catch(() => { message.destroy(); message.error("更新失败"); + state.isClick = false; }); } else { //新建活动信息 @@ -504,10 +514,12 @@ export default { closeDrawer(); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; }) .catch(() => { message.destroy(); message.error("创建失败"); + state.isClick = false; }); } }; diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 6621e360..9941c82c 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -171,6 +171,7 @@ export default { time: undefined, caseId: null, caseName: "", + isClick: false }); const closeDrawer = () => { ctx.emit("update:addcaseVisible", false); @@ -279,6 +280,12 @@ export default { message.destroy(); return message.warning("请先选中关卡"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { RouterEditTask({ chapterId: props.isactive, @@ -293,12 +300,20 @@ export default { ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; + state.isClick = false; }) .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + state.isClick = false; }); } } else if (props.isLevel == 2) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTask({ @@ -314,13 +329,21 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } } else if (props.isLevel == 3) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTaskTemplate({ @@ -336,10 +359,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } } diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index ba5830b3..3e99ec49 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -194,6 +194,7 @@ export default { const state = reactive({ addLoading: false, workEnclosureAddress: "", + isClick: false }); const formRef = ref(); @@ -337,29 +338,47 @@ export default { workName: formState.workName, workRequirement: formState.workRequirement, }; + if (props.EditWorkId > 0) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + updateWorkTaskUsing(obj) .then(async(res) => { // console.log("添加成功", res); await updateTask(res); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch((err) => { message.destroy(); message.error(`添加失败${err}`); + state.isClick = false; }); } else { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; createWorkTask(obj) .then(async(res) => { console.log("添加成功", res); await updateTask(res); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch((err) => { message.destroy(); message.error(`添加失败${err}`); + state.isClick = false; }); } }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 3bb6dc62..aab3d6dc 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -105,6 +105,7 @@ export default { assessment1: null, assessmentVisible: false, titleTag: false, + isClick: false }); // const getCheckedAss = (ass) => { // state.assessmentId = ass.assessmentId; @@ -153,6 +154,12 @@ export default { message.destroy(); return message.warning("请先选中关卡"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistence({ chapterId: Number(props.isactive), courseTaskId: l_data_id, @@ -174,6 +181,7 @@ export default { } message.destroy(); message.warning("评估（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { RouterEditTask({ @@ -192,17 +200,26 @@ export default { ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + state.isClick = false; }); } }) .catch((err) => { console.log(err); + state.isClick = false; }); } else if (props.isLevel == 2) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProject({ courseTaskId: l_data_id, projectId: props.projectId, @@ -224,6 +241,7 @@ export default { } message.destroy(); message.warning("评估（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { apiTask @@ -239,16 +257,25 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } }) .catch((err) => { console.log(err); + state.isClick = false; }); } else if (props.isLevel == 3) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProjectTemplate({ courseTaskId: l_data_id, projectTemplateId: props.projectTemplateId, @@ -269,6 +296,7 @@ export default { } message.destroy(); message.warning("评估（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { addTempTask({ @@ -284,10 +312,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } }); diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 8e1f08c6..e6ab1960 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -482,6 +482,7 @@ export default { switchC2: false, assessmentVisible: false, assessmentName: "", + isClick: false }); const closeDrawer = () => { ctx.emit("update:addliveVisible", false); @@ -693,6 +694,13 @@ export default { message.destroy(); return message.warning("请输入直播公告"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + const regular = /^[+]{0,1}(\d+)$/; if (!regular.test(state.inputV2)) { message.destroy(); @@ -743,9 +751,11 @@ export default { message.success("提交成功"); closeDrawer(); await updateTask(res); + state.isClick = false; }) .catch((err) => { console.log(err); + state.isClick = false; }); } else { api @@ -755,8 +765,11 @@ export default { message.success("提交成功"); await updateTask(res); closeDrawer(); + state.isClick = false; }) - .catch(() => {}); + .catch(() => { + state.isClick = false; + }); } }; const beforeUpload = (file) => { diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index fc8eadc6..f22ce374 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -232,6 +232,7 @@ export default { pageSize: 10, choicecourse: true, ddLoading: false, + isClick: false }); const ChoiceCourse = () => { state.choicecourse = false; @@ -455,6 +456,12 @@ export default { l_data_id.push(item["courseId"]); }); console.log("需要查询的在线课ID", l_data_id); + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistence({ chapterId: Number(props.isactive), courseTaskId: l_data_id, @@ -475,6 +482,7 @@ export default { } message.destroy(); message.warning("在线课（" + tipStr + "）重复添加"); + state.isClick = false; state.addLoading = false; return; } else { @@ -498,6 +506,7 @@ export default { ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; + state.isClick = false; }) .catch(() => { state.addLoading = false; @@ -505,12 +514,14 @@ export default { message.error( `${props.edit ? "编辑" : "新增"}关卡任务失败` ); + state.isClick = false; }); }); } }) .catch((err) => { console.log(err); + state.isClick = false; }); } else if (props.isLevel == 2) { console.log("我是要便利的数据2", state.addOnlineList); @@ -520,6 +531,12 @@ export default { p_data_id.push(item["courseId"]); }); console.log("需要查询的在线课ID", p_data_id); + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProject({ courseTaskId: p_data_id, projectId: Number(props.projectId), @@ -540,6 +557,7 @@ export default { } message.destroy(); message.warning("在线课（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { state.addOnlineList.map((value) => { @@ -557,10 +575,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); }); } @@ -576,6 +596,12 @@ export default { p_data_id.push(item["courseId"]); }); console.log("需要查询的在线课ID", p_data_id); + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProjectTemplate({ courseTaskId: p_data_id, projectTemplateId: props.projectTemplateId, @@ -595,6 +621,7 @@ export default { } message.destroy(); message.warning("在线课（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { state.addOnlineList.map((value) => { @@ -614,10 +641,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); + state.isClick = false; }); }) } diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 62537d96..275bc7ed 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -155,6 +155,7 @@ export default { inputV2: "", textV1: "", title: null, + isClick: false }); const closeDrawer = () => { ctx.emit("update:addrefVisible", false); @@ -253,6 +254,14 @@ export default { return message.warning("请输入合法的链接地址"); } } + + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + let obj = { linkAddress: state.inputV2, linkDescription: state.textV1, @@ -266,8 +275,11 @@ export default { message.success("编辑成功"); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; }) - .catch(() => {}); + .catch(() => { + state.isClick = false; + }); } else { api .createExternalChain(obj) @@ -275,8 +287,11 @@ export default { message.success("提交成功"); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; }) - .catch(() => {}); + .catch(() => { + state.isClick = false; + }); } }; // 查询任务