feat:合并

This commit is contained in:
李晓鸽
2022-11-03 17:52:40 +08:00
parent 6b6f3228f6
commit a6ae87d885
6 changed files with 83 additions and 47 deletions

View File

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