diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 1e35624f..20a9c8db 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -70,7 +70,7 @@ export default { href: "/leveladd", }, { - name: "创建关卡", + name: "管理", }, ]; } diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 1f82eaf6..03073251 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -332,7 +332,7 @@ export default { href: "/leveladd", openKeys: "sub1", selectedKeys: "sub1", - pagename: "关卡", + pagename: "管理", }, { href: "/levelcheck", @@ -344,7 +344,7 @@ export default { href: "/leveladddetail", openKeys: "sub1", selectedKeys: "sub1", - pagename: "创建关卡", + pagename: "关卡", }, { href: "/projectmanage", diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index a650c0a4..049eaa5f 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -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 ? "编辑" : "新增"}任务失败`); - }); + + } }; diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index ee6c48d3..a52a58bd 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -119,6 +119,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, + type: 'radio', }" :columns="tableDataFunc()" :data-source="tableData" @@ -158,6 +159,7 @@ import { RouterEditTask, IsExistence, IsExistenceProject, + IsExistenceProjectTemplate } from "@/api/indexTask"; import { addTempTask } from "../../api/indexTaskadd"; export default { @@ -556,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){ diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index 6b41b554..3ca6d4c9 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -78,7 +78,6 @@ onMounted(() => { function getMemberData() { - console.log(memberParam) if (!memberParam.value.keyWord) { return } @@ -93,9 +92,12 @@ function getMemberData() { return; } const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({ - label: e.realName, + label: e.realName + e.userNo, value: e.id, - deptId: e.departId + deptId: e.departId, + departName: e.departName, + userNo: e.userNo, + name: e.realName })); memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list) loading.value = false @@ -125,10 +127,10 @@ function blur() { function change(e, l) { isOpen.value = false Array.isArray(l) && (selectOptions.value = l) - Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId) + Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId, selectOptions.value.find(e => e.deptId)?.departName) if (Array.isArray(l)) { emit('update:name', l.map(t => t.label).join(',')) - emit('update:value', l.map(t => t.value).join(',')) + emit('update:value', l.map(t => t.label).join(',')) } else { emit('update:name', l?.label) emit('update:value', l?.value) diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 11458458..0320e0ba 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -21,7 +21,7 @@
@@ -338,7 +338,7 @@