From e98d551090f0af14acbff9f41ad48a81dedfa4d4 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 9 Dec 2022 15:46:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=9C=AA=E5=88=9B=E5=BB=BA=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/courseModal.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 11458458..fdb4b71d 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -21,7 +21,7 @@
@@ -424,6 +424,13 @@ export default defineComponent({ emit("visibleClose"); }; + // 未编辑直接离开的 不予刷新 + const noEditClose = () => { + state.ft_hs = false; + ft_exit(); + emit("noEdit"); + } + expose({ visibleOpen, visibleClose, @@ -735,7 +742,7 @@ export default defineComponent({ handleTagClose, handlePush, reviewClick, - + noEditClose, editorRef, valueHtml, mode: "simple", // 或 'simple' From a3026152b08fb2eeb3b1f00f06bee02423b89b0d Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 9 Dec 2022 15:52:22 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=9C=AA=E5=88=9B=E5=BB=BA=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/courseModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index fdb4b71d..0320e0ba 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -338,7 +338,7 @@
-
+
取消
From 1faca0b6c3e5490df333f9f7898646c910a4284a Mon Sep 17 00:00:00 2001 From: zhangyc Date: Fri, 9 Dec 2022 16:05:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=A1=B5=E7=AD=BE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BreadCrumb.vue | 2 +- src/components/NavLeft.vue | 4 ++-- src/components/drawers/AddOnline.vue | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) 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/AddOnline.vue b/src/components/drawers/AddOnline.vue index ee6c48d3..3f09e021 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" From aaa60649119d6d2be6c22b5bf0de5ef1b9b578b9 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 9 Dec 2022 16:56:29 +0800 Subject: [PATCH 4/8] -- bug --- src/views/projectcenter/LibraryAdd.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 48010f77..5d7e4365 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -534,7 +534,7 @@
资源归属：
{{ - projectInfo.sourceBelong + projectInfo.sourceBelongName }}
@@ -559,17 +559,13 @@
项目级别：
- {{ - projectInfo.level - }} +
培训体系：
- {{ - projectInfo.systemId - }} +
@@ -712,8 +708,14 @@ import { message } from "ant-design-vue"; import * as api from "@/api/indexTemplate"; import { useRouter } from "vue-router"; import { scoreRule, setScoreRule } from "@/api/indexTaskadd"; +import ProjectLevel from "@/components/project/ProjectLevel"; +import TrainClass from "@/components/project/TrainClass"; export default defineComponent({ name: "LibraryAdd", + components: { + ProjectLevel, + TrainClass, + }, setup() { const state = reactive({ //任务大纲列表 From c82d46c7780429243e8d89e599c9e16683422b1c Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 9 Dec 2022 17:06:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=E6=A8=A1=E6=9D=BF=E5=BA=93=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=8B=E8=AF=84=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddInvist.vue | 60 ++++++++++++++++------ src/components/drawers/AddOnline.vue | 75 ++++++++++++++++++++-------- 2 files changed, 99 insertions(+), 36 deletions(-) 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 3f09e021..a52a58bd 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -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){ From f331d302a44ae2490da9a5fb79b4e12e17c5e50c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 9 Dec 2022 17:35:32 +0800 Subject: [PATCH 6/8] -- bug --- src/components/project/ProjectManagerNew.vue | 5 +- src/views/projectcenter/ProjectManage.vue | 1323 +++++++++--------- 2 files changed, 665 insertions(+), 663 deletions(-) diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index 6b41b554..63063012 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -95,7 +95,8 @@ function getMemberData() { const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({ label: e.realName, value: e.id, - deptId: e.departId + deptId: e.departId, + departName: e.departName })); memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list) loading.value = false @@ -125,7 +126,7 @@ 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(',')) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 33f9bc8e..e1ffeb44 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -6,55 +6,55 @@
@@ -79,26 +79,26 @@
@@ -107,18 +107,18 @@