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..ad5eaee1 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -20,7 +20,7 @@
+ :maxlength="20"/>
@@ -32,11 +32,11 @@
- 删除课程 + {{chooseCourseName}}
@@ -197,7 +197,9 @@
+ v-model:assessmentId="assessmentId" + v-model:assessmentName="assessmentName" + /> @@ -211,23 +213,39 @@
-
- - 删除作业 - -
+ v-model:EditWorkId="EditWorkId" + v-model:workName="workName" + />
-
+
+
+ 已选作业: +
+
+ + + {{workName}} + + +
+ + +
+ +
+
@@ -235,18 +253,30 @@
-
- - 删除考试 - -
+
- +
+
+
+
+ 已选考试: +
+
+ + + + {{testName}} + +
+ +
@@ -379,6 +409,7 @@ export default { assessmentId: null, EditTestId: null, EditWorkId: null, + workName:null, assessmentVisible: false, needEval: false, onlySign: false, diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 36d90d8e..55339bce 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, }, + workName:{ + type: String, + default: null, + }, projectTaskId: { // 要编辑的projectId type: Number, @@ -251,7 +255,9 @@ export default { }; const resetForm = () => { - formRef.value.resetFields(); + //formRef.value.resetFields(); + + }; const handleValidate = (...args) => { @@ -284,7 +290,8 @@ export default { ctx.emit("update:addhomeworkVisible", false); ctx.emit("update:edit", false); ctx.emit("update:EditWorkId", state.EditWorkId); - 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/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..2b2f5b5d 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" /> @@ -466,6 +466,10 @@ export default { type: Number, default: null, }, + testName:{ + type: String, + default: null, + }, }, setup(props, ctx) { const formState = reactive({ @@ -504,6 +508,7 @@ export default { paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用 id: "", testName: "", + TestName:"", choosedTestList: [ { value: "提高核心竞争力", @@ -657,6 +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); + console.log("formState.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; };