@@ -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;
};