From 5847f6fcba040d487fe9ba87d6f8d66b3bc45e8a Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 6 Dec 2022 00:33:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B=E5=90=8D=E7=A7=B0=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BD=9C=E4=B8=9A=E5=88=A0=E9=99=A4=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=A0=E5=87=BA=E8=80=83=E8=AF=95=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 2 +- src/components/drawers/AddEval.vue | 2 +- src/components/drawers/AddFaceteach.vue | 13 ++++++++----- src/components/drawers/AddHomework.vue | 7 ++++++- src/components/drawers/AddRef.vue | 2 +- src/components/drawers/AddTest.vue | 6 +++--- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 081dea2f..0a3cd2c9 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -33,7 +33,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入活动名称" - maxlength="50" + maxlength="20" /> diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 1c09a8ab..930d5e9b 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -19,7 +19,7 @@
+ :maxlength="20" />
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index cc83a39b..2487225d 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -20,7 +20,7 @@
+ :maxlength="20"/>
@@ -32,11 +32,11 @@
- 删除课程 + {{chooseCourseName}}
@@ -213,7 +213,7 @@
- 删除作业 + {{EditWorkName}}
@@ -222,7 +222,9 @@
+ v-model:EditWorkId="EditWorkId" + v-model:EditWorkName="EditWorkName" + />
@@ -379,6 +381,7 @@ export default { assessmentId: null, EditTestId: null, EditWorkId: null, + EditWorkName:null, assessmentVisible: false, needEval: false, onlySign: false, diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 36d90d8e..610a8e04 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -36,7 +36,7 @@ style="width: 424px; height: 32px; margin-left: 35px" placeholder="请输入作业名称" autocomplete="off" - show-count :maxlength="50" + show-count :maxlength="20" /> @@ -159,6 +159,10 @@ export default { type: Number, default: null, }, + EditWorkName:{ + type: String, + default: null, + }, projectTaskId: { // 要编辑的projectId type: Number, @@ -284,6 +288,7 @@ export default { ctx.emit("update:addhomeworkVisible", false); ctx.emit("update:edit", false); ctx.emit("update:EditWorkId", state.EditWorkId); + ctx.emit("update:EditWorkName", state.workName); console.log("state.EditWorkId==============", state.EditWorkId); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index a6b55e71..ac7e780c 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -42,7 +42,7 @@ v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入外链名称" - show-count :maxlength="50" + show-count :maxlength="20" /> diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 515d1218..b9b9f403 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -58,7 +58,7 @@ style="width: 424px; height: 32px; margin-left: 35px" autocomplete="off" placeholder="请输入考试名称" - show-count :maxlength="50" + show-count :maxlength="20" /> @@ -338,7 +338,7 @@ style="width: 424px; height: 32px; margin-left: 35px" autocomplete="off" placeholder="请输入考试名称" - show-count :maxlength="50" + show-count :maxlength="20" /> @@ -355,7 +355,7 @@ style="width: 424px; height: 32px; margin-left: 35px" autocomplete="off" placeholder="数据来源" - show-count :maxlength="50" + show-count :maxlength="20" /> From fc6a7258a0e0b9d7461e87da3c8e3fb9b54e30fa Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 6 Dec 2022 00:34:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=80=83=E8=AF=95=E5=90=8E=EF=BC=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 57 ++++++++++++++++++----- src/components/drawers/AddHomework.vue | 10 ++-- src/components/drawers/AddTest.vue | 2 + src/views/learningpath/LevelAddDetail.vue | 8 +++- 4 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 2487225d..df770322 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -197,7 +197,9 @@ + v-model:assessmentId="assessmentId" + v-model:assessmentName="assessmentName" + /> @@ -211,11 +213,6 @@
-
- - {{EditWorkName}} - -
@@ -223,13 +220,32 @@
-
+
+
+ 已选作业： +
+
+ + + {{workName}} + + +
+ + +
+ +
+
@@ -237,13 +253,30 @@
-
+ + +
+ +
+ +
+ +
+
+
+ 已选考试: +
+
+ + - 删除考试 + {{testName}}
-
+
@@ -381,7 +414,7 @@ export default { assessmentId: null, EditTestId: null, EditWorkId: null, - EditWorkName:null, + workName:null, assessmentVisible: false, needEval: false, onlySign: false, diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 610a8e04..b5584f7a 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -159,7 +159,7 @@ export default { type: Number, default: null, }, - EditWorkName:{ + workName:{ type: String, default: null, }, @@ -255,7 +255,9 @@ export default { }; const resetForm = () => { - formRef.value.resetFields(); + //formRef.value.resetFields(); + + }; const handleValidate = (...args) => { @@ -288,8 +290,8 @@ export default { ctx.emit("update:addhomeworkVisible", false); ctx.emit("update:edit", false); ctx.emit("update:EditWorkId", state.EditWorkId); - ctx.emit("update:EditWorkName", state.workName); - console.log("state.EditWorkId==============", state.EditWorkId); + ctx.emit("update:workName", formState.workName); + console.log("state.EditWorkId==============", state.workName); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); fileList.value = []; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index b9b9f403..a4db8a7c 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -504,6 +504,7 @@ export default { paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用 id: "", testName: "", + TestName:"", choosedTestList: [ { value: "提高核心竞争力", @@ -657,6 +658,7 @@ export default { ctx.emit("update:addtestVisible", false); ctx.emit("update:edit", false); ctx.emit("update:EditTestId", state.EditTestId); + ctx.emit("update:TestName", state.testName); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); resetForm(); diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index f2f5540f..b3f51883 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -905,7 +905,9 @@
- 请确认是否批量删除任务 + 请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}
@@ -1628,8 +1630,10 @@ export default { state.gqxy_hs = !state.gqxy_hs; }; const showDeleteALLModal = (type) => { - if (state.selectRow.length === 0) + if (state.selectRow.length === 0){ + message.destroy(); return message.warning("请选择要删除的任务"); + } state.deleteAll = true; state.deleteType = type; }; From 730f29c1ba2cf31ecc741484283616d239e606a8 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 6 Dec 2022 00:56:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 11 +++-------- src/components/drawers/AddHomework.vue | 2 +- src/components/drawers/AddTest.vue | 7 ++++++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index df770322..ad5eaee1 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -32,7 +32,7 @@
@@ -259,7 +259,7 @@
@@ -276,12 +276,7 @@
- - -
- -
- +
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index b5584f7a..55339bce 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -256,7 +256,7 @@ export default { const resetForm = () => { //formRef.value.resetFields(); - + }; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index a4db8a7c..2b2f5b5d 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -466,6 +466,10 @@ export default { type: Number, default: null, }, + testName:{ + type: String, + default: null, + }, }, setup(props, ctx) { const formState = reactive({ @@ -658,7 +662,8 @@ export default { ctx.emit("update:addtestVisible", false); ctx.emit("update:edit", false); ctx.emit("update:EditTestId", state.EditTestId); - ctx.emit("update:TestName", state.testName); + ctx.emit("update:testName", state.testName); + console.log("formState.testName", state.testName); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); resetForm();