From 11d9ca91f701c4ea9b23e02f46b5dfa76f69c3d2 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 21:08:01 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0id=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddCase.vue | 5 + src/views/learningpath/LevelAddDetail.vue | 145 ++++++++++++---------- 2 files changed, 84 insertions(+), 66 deletions(-) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 7d98ba2b..578efef5 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -123,6 +123,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -295,6 +299,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 3, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 68fbb4fb..0f735dc8 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -122,21 +122,21 @@
-
{{ value1.length }}/20
+
{{ value1?value1.length:0 }}/20
-
+ margin-right: 2px;">
关卡说明：
-
{{ value2.length }}/100
+
{{ value2?value2.length:0 }}/100
@@ -204,7 +204,7 @@ v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditOnlineId="EditOnlineId" - :isLevel="isLevel" /> + :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
@@ -219,7 +219,7 @@ + v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
@@ -236,7 +236,7 @@ v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditCaseId="EditCaseId" - :isLevel="isLevel" /> + :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" />
@@ -253,7 +253,7 @@ + v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" />
@@ -269,7 +269,7 @@ + v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" />
@@ -283,7 +283,7 @@
+ v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" />
@@ -297,7 +297,7 @@
+ v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" />
@@ -313,7 +313,7 @@ + v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" />
@@ -328,7 +328,7 @@ + v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" />
@@ -344,7 +344,7 @@ v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditEvalId="EditEvalId" - :isLevel="isLevel" /> + :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> @@ -361,7 +361,7 @@ + v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> @@ -379,7 +379,7 @@ + v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> @@ -396,7 +396,7 @@ + v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft" /> @@ -538,21 +538,20 @@
+ margin-right: 20px;">
- + element.id, + element.routerTaskId + )"> 编辑 @@ -958,6 +957,7 @@ export default { //项目 EditProjectId: "", routerTaskId: "", + taskIdDraft: "", chapterId: "", stageId: "", cC: false, @@ -1179,82 +1179,95 @@ export default { } //在线抽屉 - const showDrawerAddOnline = (id, eleId) => { + const showDrawerAddOnline = (id, eleId, routerTaskId) => { state.addonlinevisible = true; state.EditOnlineId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //面授抽屉 - const showAddface = (id, eleId) => { + const showAddface = (id, eleId, routerTaskId) => { state.addfaceteachVisible = true; state.EditFaceId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //案例抽屉 - const showDrawerAddCase = (id, eleId) => { + const showDrawerAddCase = (id, eleId, routerTaskId) => { state.addcasevisible = true; state.EditCaseId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; // 作业抽屉 - const showDrawerAddHomework = (id, eleId) => { + const showDrawerAddHomework = (id, eleId, routerTaskId) => { state.addhomeworkvisible = true; state.EditWorkId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //考试抽屉 - const showDrawerAddTest = (id, eleId) => { + const showDrawerAddTest = (id, eleId, routerTaskId) => { state.addtestvisible = true; state.EditTestId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //测试抽屉 - const showDrawerAddEval = (id, eleId) => { + const showDrawerAddEval = (id, eleId, routerTaskId) => { state.addevalvisible = true; state.EditEvalId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //评估抽屉 - const showDrawerAddInvist = (id, eleId) => { + const showDrawerAddInvist = (id, eleId, routerTaskId) => { state.addinvistvisible = true; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; state.EditInvistId = id; + state.taskIdDraft = eleId; }; //投票抽屉 - const showDrawerAddVote = (id, eleId) => { + const showDrawerAddVote = (id, eleId, routerTaskId) => { state.addvotevisible = true; state.EditVoteId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //直播抽屉 - const showDrawerAddLive = (id, eleId) => { + const showDrawerAddLive = (id, eleId, routerTaskId) => { state.addlivevisible = true; state.EditLiveId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //外链抽屉 - const showDrawerAddRef = (id, eleId) => { + const showDrawerAddRef = (id, eleId, routerTaskId) => { state.addrefvisible = true; state.EditRefId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //讨论抽屉 - const showDrawerAddDiscuss = (id, eleId) => { + const showDrawerAddDiscuss = (id, eleId, routerTaskId) => { state.adddiscussvisible = true; state.EditDiscussId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //活动抽屉 - const showDrawerAddActive = (id, eleId) => { + const showDrawerAddActive = (id, eleId, routerTaskId) => { state.addactivevisible = true; state.EditActiveId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //打开项目抽屉 - const showDrawerAddProj = (id, eleId) => { + const showDrawerAddProj = (id, eleId, routerTaskId) => { state.addprojvisible = true; state.EditProjectId = id; - state.routerTaskId = eleId; + state.routerTaskId = routerTaskId; + state.taskIdDraft = eleId; }; //tableData数据赋值方法 const dataAssignment = (id) => { @@ -1676,35 +1689,35 @@ export default { } }; //编辑的按钮 - const decideType = (type, id, eleId) => { + const decideType = (type, id, eleId, routerTaskId) => { state.edit = true; console.log(type, id); if (type == "外链") { - showDrawerAddRef(id, eleId); + showDrawerAddRef(id, eleId, routerTaskId); } else if (type == "直播") { - showDrawerAddLive(id, eleId); + showDrawerAddLive(id, eleId, routerTaskId); } else if (type == "作业") { - showDrawerAddHomework(id, eleId); + showDrawerAddHomework(id, eleId, routerTaskId); } else if (type == "考试") { - showDrawerAddTest(id, eleId); + showDrawerAddTest(id, eleId, routerTaskId); } else if (type == "讨论") { - showDrawerAddDiscuss(id, eleId); + showDrawerAddDiscuss(id, eleId, routerTaskId); } else if (type == "活动") { - showDrawerAddActive(id, eleId); + showDrawerAddActive(id, eleId, routerTaskId); } else if (type == "测评") { - showDrawerAddEval(id, eleId); + showDrawerAddEval(id, eleId, routerTaskId); } else if (type == "评估") { - showDrawerAddInvist(id, eleId); + showDrawerAddInvist(id, eleId, routerTaskId); } else if (type == "投票") { - showDrawerAddVote(id, eleId); + showDrawerAddVote(id, eleId, routerTaskId); } else if (type == "项目") { - showDrawerAddProj(id, eleId); + showDrawerAddProj(id, eleId, routerTaskId); } else if (type == "在线") { - showDrawerAddOnline(id, eleId); + showDrawerAddOnline(id, eleId, routerTaskId); } else if (type == "案例") { - showDrawerAddCase(id, eleId); + showDrawerAddCase(id, eleId, routerTaskId); } else if (type == "面授") { - showAddface(id, eleId); + showAddface(id, eleId, routerTaskId); } }; From 603a4aa255cfeca19b6d4e39a7f0e05451a05f48 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 21:50:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 8 ++++++++ src/components/drawers/AddDiscuss.vue | 7 +++++++ src/components/drawers/AddEval.vue | 8 ++++++++ src/components/drawers/AddFaceteach.vue | 8 +++++++- src/components/drawers/AddHomework.vue | 8 +++++++- src/components/drawers/AddInvist.vue | 7 +++++++ src/components/drawers/AddLive.vue | 8 ++++++++ src/components/drawers/AddOnline.vue | 5 +++++ src/components/drawers/AddProject.vue | 5 +++++ src/components/drawers/AddRef.vue | 7 +++++++ src/components/drawers/AddTest.vue | 15 ++++++++++++++- src/components/vote/AddVote.vue | 7 +++++++ 12 files changed, 90 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 7bb814d5..3515061c 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -264,6 +264,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -403,6 +407,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 9, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -420,6 +425,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 9, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -437,6 +443,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 9, + id: props.taskIdDraft }) .then(() => { ctx.emit("changeData", false); @@ -491,6 +498,7 @@ export default { beforeSignIn: state.inputV4 ? state.inputV4 : 0, //活动开始前多少分钟签到 signOutTime: state.inputV6, //签退开始时间 standardSettings: state.radioV1, //标准设置 + id: props.edit ? props.taskIdDraft : "" }; console.log("obj", obj); if (props.edit) { diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 020507ca..7c6d32a3 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -91,6 +91,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -203,6 +207,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 8, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -219,6 +224,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 8, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -255,6 +261,7 @@ export default { discussSettings: state.discussSettings, //讨论设置 discussId: props.edit ? props.EditDiscussId : 0, //讨论Id projectId: 0, //项目id,接口多余字段， + id: props.edit?props.taskIdDraft:"" }; if (props.edit) { api diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 8b698b0a..7ce0b020 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -105,6 +105,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -194,6 +198,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 10, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`); @@ -212,6 +217,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 10, + id: props.taskIdDraft }) .then(() => { //message.destroy() @@ -229,6 +235,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 10, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -301,6 +308,7 @@ export default { evaluationTag: "", updateTime: "", type:state.type, + id: props.edit ? props.taskIdDraft : "" }; api .updateEvaluation(objei) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 69ed5074..cbdaf3d7 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -408,6 +408,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditFaceId: { // 要编辑的workId type: Number, @@ -707,7 +711,7 @@ export default { testId: state.EditTestId, duration: state.duration, attach:state.attach, - + id: props.taskIdDraft }; console.log("obj============", obj, "6" + "9"); console.log("222222222"); @@ -748,6 +752,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 2, + id: props.taskIdDraft }; await RouterEditTask(editObj1) .then(() => { @@ -768,6 +773,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 2, + id: props.taskIdDraft }; // 新增编辑或新增项目 await ProjectEditTask(editObj) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 92eca057..beb7b089 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -115,6 +115,10 @@ export default { type: Boolean, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, projectId: { type: Number, default: null, @@ -356,6 +360,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 4, + id: props.taskIdDraft }; RouterEditTask(editObj1) @@ -377,6 +382,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 4, + id: props.taskIdDraft }; console.log("editObj", editObj); ProjectEditTask(editObj) @@ -460,7 +466,7 @@ export default { disabledDate, disabledDateTime, afterVisibleChange, - FILE_UPLOAD_URL, + FILE_UPLOAD_URL, closeDrawer, closeDrawer2, changevalue, diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index aab3d6dc..2ffdf49d 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -46,6 +46,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditInvistId: { type: Number, default: null, @@ -165,6 +169,7 @@ export default { courseTaskId: l_data_id, routerId: props.routerId, type: 11, + id: props.taskIdDraft }) .then((res) => { console.log("shifouchongfu", res); @@ -191,6 +196,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 11, + id: props.taskIdDraft }) .then(() => { message.destroy(); @@ -225,6 +231,7 @@ export default { projectId: props.projectId, stageId: props.chooseStageId || 0, type: 11, + id: props.taskIdDraft }) .then((res) => { console.log(res); diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 37982c4f..189f1f27 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -404,6 +404,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditLiveId: { type: Number, default: null, @@ -621,6 +625,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 6, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -639,6 +644,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 6, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -657,6 +663,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 6, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -747,6 +754,7 @@ export default { signOutTime: state.inputV8, standardSettings: state.radioV1, //1或2 isEvaluate: state.needEval ? "1" : "0", + id: props.edit? props.taskIdDraft : "" }; console.log("我是要更新的数据", state.obj); diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 3fe6438d..402b60c3 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -194,6 +194,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -532,6 +536,7 @@ export default { routerTaskId: props.routerTaskId || 0, type: 1, duration: value.studyTime, + id: props.taskIdDraft }) .then((res) => { if (res.data.code == 200) { diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 1e839168..3b7f5c86 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -244,6 +244,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditProjectId: { type: Number, default: null, @@ -574,6 +578,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 13, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 4f467503..4ede6963 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -108,6 +108,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -194,6 +198,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 7, + id: props.taskIdDraft }) .then(async () => { // message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -213,6 +218,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 7, + id: props.taskIdDraft }) .then(() => { // message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); @@ -231,6 +237,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 7, + id: props.taskIdDraft }) .then(() => { //message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index af7da93b..fa8df3fc 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -423,6 +423,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, isactive: { type: Number, default: null, @@ -663,6 +667,7 @@ export default { state.test.targetId = 0; state.test.type = 0; state.test.chapterId=0; + state.test.id = props.taskIdDraft; console.log("props.offCourseId",props.offCourseId); if (props.faceLevel && props.offCourseId > 0) { state.test.targetId = props.offCourseId; @@ -724,6 +729,7 @@ export default { state.test1.targetId = 0; state.test1.type = 0; state.test1.chapterId=0; + state.test1.id = props.taskIdDraft; console.log("props.offCourseId",props.offCourseId); if (props.faceLevel && props.offCourseId > 0) { state.test1.targetId = props.offCourseId; @@ -748,7 +754,8 @@ export default { examinationId:props.EditTestId, examinationName:state.test1.externalName, examinationExplain:state.test1.externalExplain, - source:state.test1.source + source:state.test1.source, + id: props.taskIdDraft } updateExternalExam(obj) .then(async (res) => { @@ -793,6 +800,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 5, + id: props.taskIdDraft }; RouterEditTask(editObj1) .then(() => { @@ -815,6 +823,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }; // 新增编辑或新增项目 ProjectEditTask(editObj) @@ -837,6 +846,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); @@ -871,6 +881,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 5, + id: props.taskIdDraft }; RouterEditTask(editObj1) .then(() => { @@ -892,6 +903,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }; // 新增编辑或新增项目 ProjectEditTask(editObj) @@ -913,6 +925,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index da5efedb..c1fbabd3 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -154,6 +154,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { type: Boolean, default: false, @@ -299,6 +303,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 12, + id: props.taskIdDraft }).then(() => { ctx.emit("changeData", false); state.addLoading = false; @@ -311,6 +316,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 12, + id: props.taskIdDraft }) .then(() => { ctx.emit("changeData", false); @@ -323,6 +329,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 12, + id: props.taskIdDraft }) .then(() => { ctx.emit("changeData", false); From ae1f2149f9cc434ea6251c7e12d0696f64443b9e Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 22:28:44 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9AID?= =?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/AddHomework.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index beb7b089..bc883e19 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -271,6 +271,7 @@ export default { workId: props.EditWorkId >0 ? props.EditWorkId:0 , workName: state.name, workRequirement: state.workRequirement, + id: props.edit ? props.taskIdDraft : "" }; if (props.EditWorkId > 0) { From 0a236e01873adff25caea4d9354e4ecd65f55617 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 23:34:36 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=E7=9B=B4=E6=92=ADid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 4 ++-- src/components/drawers/AddLive.vue | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index cbdaf3d7..7133c1a9 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -710,8 +710,8 @@ export default { offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0, testId: state.EditTestId, duration: state.duration, - attach:state.attach, - id: props.taskIdDraft + attach:state.attach, + id: props.edit ? props.taskIdDraft : null }; console.log("obj============", obj, "6" + "9"); console.log("222222222"); diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 189f1f27..d70845cf 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -753,8 +753,7 @@ export default { otherSettings: state.switchC2 ? "1" : "0", //1或0 signOutTime: state.inputV8, standardSettings: state.radioV1, //1或2 - isEvaluate: state.needEval ? "1" : "0", - id: props.edit? props.taskIdDraft : "" + isEvaluate: state.needEval ? "1" : "0" }; console.log("我是要更新的数据", state.obj); From ef1898c613c977fe140af243b43be48d8e08756a Mon Sep 17 00:00:00 2001 From: fooperage Date: Mon, 13 Feb 2023 23:45:58 +0800 Subject: [PATCH 5/8] '..' --- package.json | 1 + src/api/indexStu.js | 3 +- src/components/drawers/StuAdd.vue | 30 +- src/utils/commonExcel.js | 40 + src/views/courselibrary/CoursewareManage.vue | 370 ++- .../courselibrary/CoursewareManage_Old.vue | 3 +- src/views/courselibrary/courseModal.vue | 2124 ++++++++--------- src/views/examine/CourseReviewedN.vue | 9 +- 8 files changed, 1218 insertions(+), 1362 deletions(-) create mode 100644 src/utils/commonExcel.js diff --git a/package.json b/package.json index 2b265fab..cfdc9962 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "dayjs": "^1.11.6", "element-plus": "^2.2.17", "element-resize-detector": "^1.2.4", + "exceljs": "^4.3.0", "html2canvas": "^1.4.1", "jquery": "^3.6.1", "json-bigint": "^1.0.0", diff --git a/src/api/indexStu.js b/src/api/indexStu.js index feec5527..9889f8db 100644 --- a/src/api/indexStu.js +++ b/src/api/indexStu.js @@ -4,8 +4,7 @@ import http from "./config"; * 1 */ //获取受众信息 -export const getAudienceInfoApi = (obj) => - http.post("/admin/orgStruct/getAudienceInfo", obj); +// export const getAudienceInfoApi = (obj) => http.post("/admin/orgStruct/getAudienceInfo", obj); //获取员工信息 export const getMemberInfoApi = (obj) => http.post("/admin/orgStruct/getMemberInfo", obj); diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue index 236099bd..a7cba6cf 100644 --- a/src/components/drawers/StuAdd.vue +++ b/src/components/drawers/StuAdd.vue @@ -551,7 +551,7 @@ import { message } from "ant-design-vue"; // import { toDate } from "../../api/method"; // import * as api from '../../api/indexStu' import { - getAudienceInfoApi, + // getAudienceInfoApi, getMemberInfoApi, getOrgInfoApi, } from "@/api/indexStu"; @@ -1239,20 +1239,20 @@ export default { if (!state.nameaddd) { return false; } - const item1 = await getAudienceInfoApi({ - pageNo: state.currentPage2, - pageSize: state.pageSize2, - keyWord: state.nameaddd, - }).then((res) => { - if (res.data.code === 200) return res.data.data.rows; - }); - state.tabledata2 = traverseArr(item1, { - key: "id", - name: "audienceName", - time: "createTime", - number: "countNum", - type: "typeName", - }); + // const item1 = await getAudienceInfoApi({ + // pageNo: state.currentPage2, + // pageSize: state.pageSize2, + // keyWord: state.nameaddd, + // }).then((res) => { + // if (res.data.code === 200) return res.data.data.rows; + // }); + // state.tabledata2 = traverseArr(item1, { + // key: "id", + // name: "audienceName", + // time: "createTime", + // number: "countNum", + // type: "typeName", + // }); }; getShouzong(); diff --git a/src/utils/commonExcel.js b/src/utils/commonExcel.js new file mode 100644 index 00000000..49749ff1 --- /dev/null +++ b/src/utils/commonExcel.js @@ -0,0 +1,40 @@ +import Exceljs from 'exceljs' + +export const commonExport =(headers,datas,fileName) =>{ + + const workbook = new Exceljs.Workbook() + workbook.created = new Date(); + const sheet = workbook.addWorksheet("Sheet1",{views: [{ySplit:1,state:'frozen'}]}) + sheet.columns = headers + sheet.addRows(datas) + sheet.eachRow({ includeEmpty: true },(row,rowNumber)=>{ + row.eachCell({ includeEmpty: true },(cell,colNumber)=>{ + cell.alignment = { vertical: 'middle', horizontal: 'center'} + cell.border = { + top: {style:'thin'}, + left: {style:'thin'}, + bottom: {style:'thin'}, + right: {style:'thin'} + } + }) + }) + + downExcel(workbook,fileName) +} + +export const downExcel = (wb,fileName)=>{ + wb.xlsx.writeBuffer().then(buffer=>{ + let blob = new Blob([buffer],{ + type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + }) + let ele = document.createElement('a') + ele.style.display = 'none' + ele.href = URL.createObjectURL(blob) + ele.download = fileName + document.body.appendChild(ele) + ele.click() + document.body.removeChild(ele) + URL.revokeObjectURL(ele.href) + wb = null + }) +} \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 35253e3b..fcfcfde8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -305,90 +305,34 @@ -
+