hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 03:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-09 17:35:43 +08:00
parent f331d302a4 c82d46c778
commit 9a70bdcf0e
2 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/components/drawers/AddInvist.vue
View File

@@ -104,7 +104,7 @@
import { reactive, toRefs } from "vue";
import * as apiTask from "../../api/indexTaskadd";
import { message } from "ant-design-vue";
import { RouterEditTask, IsExistence, IsExistenceProject} from "@/api/indexTask";
import { RouterEditTask, IsExistence, IsExistenceProject, IsExistenceProjectTemplate} from "@/api/indexTask";
import * as api from "../../api/indexInvist";
import { addTempTask } from "../../api/indexTaskadd";
import AssessmentList from "@/components/drawers/AssessmentList.vue";
@@ -316,24 +316,52 @@ export default {
})
} else if (props.isLevel == 3) {
addTempTask({
courseId: state.assessment.assessmentId,
name: state.assessment.name,
IsExistenceProjectTemplate({
courseTaskId: [Number(state.assessment.assessmentId)],
projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
templateStageId: props.chooseStageId || 0,
type: 11,
}).then(res=>{
console.log('shifouchongfu',res)
console.log("模板路径图中是否包含此评估了", res);
if (res.data.data.length) {
let strdata = res.data.data;
let tipStr = "";
for (let i = 0; i < strdata.length; i++) {
if (i == strdata.length - 1) {
tipStr += strdata[i].courseName;
} else {
tipStr += strdata[i].courseName + "/";
}
}
message.destroy();
message.warning("评估（" + tipStr + "）重复添加");
return;
} else {
addTempTask({
courseId: state.assessment.assessmentId,
name: state.assessment.name,
projectTemplateId: props.projectTemplateId,
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 11,
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
}).catch(err=>{
console.log(err)
})
.then(() => {
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
});
}
};

75
src/components/drawers/AddOnline.vue
View File

@@ -159,6 +159,7 @@ import {
RouterEditTask,
IsExistence,
IsExistenceProject,
IsExistenceProjectTemplate
} from "@/api/indexTask";
import { addTempTask } from "../../api/indexTaskadd";
export default {
@@ -557,27 +558,61 @@ export default {
console.log(err);
});
} else if (props.isLevel == 3) {
state.addOnlineList.map((value) => {
console.log( props, props.projectTemplateId,props.projectTaskId)
addTempTask({
courseId: value.num,
name: value.name,
projectTemplateId: localStorage.getItem("projectTemplateId"),
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 1,
})
.then((res) => {
console.log('新增或者编辑在线课',res)
console.log("我是要便利的数据3", state.addOnlineList);
let p_data = state.addOnlineList;
let p_data_id = [];
p_data.map((item) => {
p_data_id.push(item["courseId"]);
});
console.log("需要查询的在线课ID", p_data_id);
IsExistenceProjectTemplate({
courseTaskId: p_data_id,
projectTemplateId: localStorage.getItem("projectTemplateId"),
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 1,
}).then(res=>{
console.log(res)
console.log("模板项目中是否包含此在线课了", res);
if (res.data.data.length) {
let strdata = res.data.data;
let tipStr = "";
for (let i = 0; i < strdata.length; i++) {
if (i == strdata.length - 1) {
tipStr += strdata[i].courseName;
} else {
tipStr += strdata[i].courseName + "/";
}
}
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
});
message.warning("在线课（" + tipStr + "）重复添加");
return;
} else {
state.addOnlineList.map((value) => {
addTempTask({
courseId: value.num,
name: value.name,
projectTemplateId: localStorage.getItem("projectTemplateId"),
projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0,
type: 1,
})
.then((res) => {
console.log('新增或者编辑在线课',res)
message.destroy();
message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
ctx.emit("changeData", false);
closeDrawer();
})
.catch(() => {
message.destroy();
message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
});
})
}
}).catch(err=>{
console.log(err)
})
}
//if(state.addOnlineList.Target==undefined){