diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 0884b32c..6f0735da 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -143,6 +143,10 @@ export default { state.textV1 = ""; message.success("创建成功"); ctx.emit("update:adddiscussVisible", false); + // let emit = defineEmits(["changeData"]); + // emit("changeData", true); + ctx.emit("changeData", "传的参数"); + // props.(true); }, 1000); }) .catch((err) => { diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index ffa87e4f..c9a4624a 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -103,7 +103,7 @@ - - - \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index cefe7a20..2043dcf8 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1292,7 +1292,11 @@ export default { message.destroy(); return message.warning("请输入路径图名称"); } - // if (!state.organizationSelectName) return message.warning("请选择归属组织"); + + // if (!state.organizationSelectName){ + // message.destroy(); + // return message.warning("请选择归属组织"); + // } // state.createLoading = true; let obj = { name: state.pathName, @@ -1303,14 +1307,19 @@ export default { api .createLearnPath(obj) .then((res) => { - setTimeout(() => { - console.log("创建成功", res); - message.success("创建成功"); - // state.createLoading = false; - state.currentPage = 1; - router.push("/leveladd"); - // getLearnPath(); - }, 1000); + console.log("创建成功", res); + message.destroy(); + message.success("创建成功"); + router.push("/leveladd"); + // setTimeout(() => { + // console.log("创建成功", res); + // message.destroy(); + // message.success("创建成功"); + // // state.createLoading = false; + // state.currentPage = 1; + // router.push("/leveladd"); + // // getLearnPath(); + // }, 1000); }) .catch((err) => { console.log("创建失败", err); @@ -1365,6 +1374,7 @@ export default { .handleLearnPath(obj) .then((res) => { console.log("删除成功", res); + message.destroy(); message.success("删除成功"); state.deleteModal = false; getLearnPath(); @@ -1375,8 +1385,15 @@ export default { }; //编辑学习路径图 const editLearnPath = () => { - if (!state.pathName) return message.warning("请输入路径图名称"); - // if (!state.organizationSelectName) return message.warning("请选择归属组织"); + if (!state.pathName) { + message.destroy(); + return message.warning("请输入路径图名称"); + } + + // if (!state.organizationSelectName){ + // message.destroy(); + // return message.warning("请选择归属组织"); + // } // state.createLoading = true; let obj = { routerId: state.editPathId, @@ -1388,15 +1405,23 @@ export default { api .createLearnPath(obj) .then((res) => { - setTimeout(() => { - console.log("修改成功", res); - message.success("修改成功"); - // state.createLoading = false; - // state.currentPage = 1; - state.out1 = false; - // router.push("/leveladd"); - getLearnPath(); - }, 1000); + console.log("修改成功", res); + message.destroy(); + message.success("修改成功"); + // state.createLoading = false; + // state.currentPage = 1; + state.out1 = false; + // router.push("/leveladd"); + getLearnPath(); + // setTimeout(() => { + // console.log("修改成功", res); + // message.success("修改成功"); + // // state.createLoading = false; + // // state.currentPage = 1; + // state.out1 = false; + // // router.push("/leveladd"); + // getLearnPath(); + // }, 1000); }) .catch((err) => { console.log("修改失败", err); @@ -2175,6 +2200,7 @@ export default { .g1 { color: #4ea6ff; font-size: 14px; + cursor: pointer; } } } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 0fc9e098..d920b069 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -258,9 +258,7 @@ - +
- +
@@ -1473,6 +1476,10 @@ export default { state.isactive = index; state.isActive = !state.isActive; }; + + const updateTableData = (data) => { + console.log("添加数据", data); + }; return { ...toRefs(state), selectProjectName, @@ -1519,6 +1526,7 @@ export default { editInvistPath, getTableData, deleteTask, + updateTableData, }; }, };