From abb398f0a5b183997c40eaa922fc343a3fbe964f Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Sat, 3 Dec 2022 10:54:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(BUG:109):=E4=BF=AE=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=BA=93=E3=80=81=E9=A1=B9=E7=9B=AE=E3=80=81=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=85=B1=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 3 ++- src/views/projectcenter/LibraryAdd.vue | 3 ++- src/views/projectcenter/TaskPage.vue | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 444bad99..6a278849 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -771,6 +771,7 @@
-
+
支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index d079e3b2..570bbce7 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -587,6 +587,7 @@
-
+
支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 81eabe0a..fb000e45 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1036,6 +1036,7 @@
-
+
支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip From ac181d97fa9f600427f15841cb29ea0431678bdd Mon Sep 17 00:00:00 2001 From: lixg Date: Sat, 3 Dec 2022 11:57:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=BB=98=E8=AE=A4=E5=BD=92=E5=B1=9E=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/method.js | 238 ++++------------------ src/components/drawers/ProjCheckPower.vue | 29 ++- src/components/drawers/ProjPowerList.vue | 3 + src/components/drawers/ProjectOwn.vue | 12 ++ src/views/learningpath/LearningPath.vue | 11 + 5 files changed, 92 insertions(+), 201 deletions(-) diff --git a/src/api/method.js b/src/api/method.js index 75c63029..f9a3eb5e 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -1,3 +1,4 @@ +import * as api from './index1' function formatNumber(n) { n = n.toString(); return n[1] ? n : "0" + n; @@ -215,7 +216,7 @@ function getCookie(name) { //滚动加载信息 const scrollLoad = (e) => { // console.log("滚动", e, b); - const {target} = e; + const { target } = e; const scrllHeight = target.scrollHeight - target.scrollTop; const clientHeight = target.clientHeight; // console.log("scrllHeight", scrllHeight, clientHeight); @@ -225,211 +226,47 @@ const scrollLoad = (e) => { return 2 } }; +//添加归属权 +function changeOwnership(classify, selectProjectId, selectPeopleArr) { + let obj = { + keyWord: "", + tag: 2, //归属权 + opt: 3, //修改 + type: + classify === "project" + ? 2 + : classify === "learnPath" + ? 1 + : classify === "course" + ? 3 + : null, + refId: selectProjectId, //项目id + // refId: 64, + pageNo: 1, + pageSize: 10, + // studentList: state.selectPeopleArr, + deptList: [], + groupList: [], + studentList: selectPeopleArr, + }; + console.log("修改归属权obj", obj); + api + .optionAuthPerm(obj) + .then((res) => { + console.log("修改授权成功", res); + // closeDrawer(); + }) + .catch((err) => { + console.log("修改授权失败", err); + }); +} //新建延迟 const commonData = { timeout: 50, } -// const organizationalTree = [ -// { -// title: "京东方", -// value: "京东方", -// children: [ -// { -// title: "产研部", -// value: "产研部", -// children: [ -// { -// title: "产品部", -// value: "产品部", -// }, -// { -// title: "研究部", -// value: "研究部", -// }, -// { -// title: "研究部2", -// value: "研究部2", -// }, -// { -// title: "研究3", -// value: "研究3", -// }, -// { -// title: "研究4", -// value: "研究4", -// }, -// { -// title: "研究部5", -// value: "研究部5", -// }, -// { -// title: "研究部6", -// value: "研究部6", -// }, -// { -// title: "研究部7", -// value: "研究部7", -// }, -// { -// title: "研究部8", -// value: "研究部8", -// }, -// { -// title: "研究部9", -// value: "研究部9", -// }, -// ], -// }, -// { -// title: "二级标题", -// value: "二级标题", -// children: [ -// { -// title: "三级标题", -// value: "三级标题", -// children: [ -// { -// title: "四级标题", -// value: "四级标题", -// children: [ -// { -// title: "五级标题", -// value: "五级标题", -// children: [ -// { -// title: "六级标题", -// value: "六级标题", -// children: [ -// { -// title: "七级标题", -// value: "七级标题", -// children: [ -// { -// title: "八级标题", -// value: "八级标题", -// children: [ -// { -// title: "九级标题", -// value: "九级标题", -// children: [ -// { -// title: "十级标题", -// value: "十级标题", -// children: [ -// { -// title: "十一级标题", -// value: "十一级标题", -// children: [ -// { -// title: "十二级标题", -// value: "十二级标题", -// children: [ -// { -// title: -// "十三级标题十三级标题十三级标题十三级标题", -// value: "十三级标题", -// children: [ -// { -// title: -// "十四级标题", -// value: -// "十四级标题", -// children: [ -// { -// title: -// "十五级标题", -// value: -// "十五级标题", -// children: [ -// { -// title: -// "十六级标题", -// value: -// "十六级标题", -// children: -// [ -// { -// title: -// "十七级标题", -// value: -// "十七级标题", -// children: -// [ -// { -// title: -// "十八级标题", -// value: -// "十八级标题", -// children: -// [ -// { -// title: -// "十九级标题", -// value: -// "十九级标题", -// children: -// [ -// { -// title: -// "二十级标题二十级标题", -// value: -// "二十级标题二十级标题", -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// ], -// }, -// { -// title: "人力资源部", -// value: "人力资源部", -// children: [ -// { -// title: "人事部", -// value: "人事部", -// }, -// { -// title: "行政部", -// value: "行政部", -// }, -// ], -// }, -// ], -// }, -// ] +// const organizationalTree = [// ] //组织树 const organizationalTree = [] @@ -444,6 +281,7 @@ export { setCookie, getCookie, scrollLoad, + changeOwnership, commonData, organizationalTree, iframeUrl, diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue index 509b156e..34a536d9 100644 --- a/src/components/drawers/ProjCheckPower.vue +++ b/src/components/drawers/ProjCheckPower.vue @@ -181,8 +181,34 @@
BOE组织树
+ + + { if (res.data.code === 200) { + console.log("搜索组织", res); state.isSearchOrg = true; // res.data.data.rows.forEach((element) => { // // console.log("element", element); // element.treeChildList = []; // }); // console.log("组织树搜索成功", res.data.data.rows); - state.treeData2 = res.data.data.rows; + state.treeData2 = res.data.data; } }) .catch((err) => { diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue index f4fa7a54..5c65c17e 100644 --- a/src/components/drawers/ProjPowerList.vue +++ b/src/components/drawers/ProjPowerList.vue @@ -177,6 +177,9 @@ export default { const closeDrawer = () => { ctx.emit("update:ProjPvisible", false); state.currentPage = 1; + state.tableData = []; + state.tableDataTotal = -1; + state.name = null; }; const afterVisibleChange = (bool) => { console.log("state", bool, props); diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue index 081c8b28..cc6a3cd4 100644 --- a/src/components/drawers/ProjectOwn.vue +++ b/src/components/drawers/ProjectOwn.vue @@ -200,6 +200,7 @@ import elementResizeDetectorMaker from "element-resize-detector"; // import { message } from "ant-design-vue"; import * as api from "../../api/index1"; import { useStore } from "vuex"; +import { message } from "ant-design-vue"; export default { name: "ProjOwnerShip", props: { @@ -407,6 +408,16 @@ export default { .optionAuthPerm(obj) .then((res) => { console.log("获取授权成功", res); + if (res.data.code === 200 && res.data.data.records.length > 0) { + state.selectedRowKeys = res.data.data.records[0].memberId; + + let obj = { + id: res.data.data.records[0].memberId, + name: res.data.data.records[0].memberName, + }; + state.choosepeople = [obj]; + state.selectPeopleArr = [obj]; + } }) .catch((err) => { console.log("获取授权失败", err); @@ -440,6 +451,7 @@ export default { .optionAuthPerm(obj) .then((res) => { console.log("修改授权成功", res); + message.success("修改归属权成功"); closeDrawer(); }) .catch((err) => { diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 38ee96d8..455642b6 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -702,6 +702,7 @@ import { message } from "ant-design-vue"; import { toDate, commonData, + changeOwnership, // setCookie } from "../../api/method"; import { storage } from "../../api/storage"; @@ -1464,6 +1465,15 @@ export default { .catch((chapterErr) => { console.log("关卡创建失败", chapterErr); }); + //添加归属权 [id: '966735050643083264', name: '丁舟航'] + let selectPeopleArr = [ + { id: res.data.data.createId, name: res.data.data.createName }, + ]; + changeOwnership( + "learnPath", + res.data.data.routerId, + selectPeopleArr + ); } }) .catch((err) => { @@ -1471,6 +1481,7 @@ export default { // state.createLoading = false; }); }; + //获取学习路径列表 const getLearnPath = () => { let obj = { From 8dde4dd9e50f8c70d7fef5d1f456e37b6e98ec13 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Sat, 3 Dec 2022 12:53:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(BUG:103):=E5=AD=A6=E4=B9=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=9B=BE=E6=B7=BB=E5=8A=A0=E8=AF=84=E4=BC=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ AssessmentList.vue | 23 ++++++++++++++++++++-- src/components/drawers/AddInvist.vue | 5 ++++- src/views/projectcenter/TaskPage.vue | 13 +++++++----- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 1ebebd8d..0be19b7f 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -47,7 +47,11 @@ expandRowByClick="true" @expand="expandTable" :pagination="false" - :row-selection="rowSelection" + :row-selection="{ + selectedRowKeys: selectedRowKeys, + onChange: onSelectChange, + type: 'radio', + }" filterMultiple:false /> @@ -101,9 +105,10 @@ export default { tableDataTotal: 0, tableData: [], selectedRowKeys: [], - assessmentId:null, + assessmentId:null }); const closeDrawer = () => { + state.selectedRowKeys = []; ctx.emit("update:assessmentVisible", false); ctx.emit("update:titleTag", true); @@ -165,6 +170,19 @@ export default { // state.selectedRowKeys = selectedRowKeys; // }; + const onSelectChange = (selectedRowKeys, selectRow) => { + console.log("selectedRowKeys changed: ", selectedRowKeys, selectRow); + state.selectedRowKeys = selectedRowKeys; + state.selectedRows = selectRow; + console.log(selectRow) + state.assessment =selectRow[0]; + state.assessmentId = selectRow[0].assessmentId; + ctx.emit("checkedAss", state.assessment); + ctx.emit("update:assessmentId", state.assessmentId); + state.selectedRowKeys = []; + closeDrawer(); + }; + const handelChangePage = (page, pageSize) => { state.currentPage = page; state.pageSize = pageSize; @@ -222,6 +240,7 @@ export default { getAllInvistText, resetInvist, handelChangePage, + onSelectChange }; }, }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 231130af..0755793f 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -54,7 +54,7 @@ > 名称： - {{ assessment1.createName }} + {{ assessment1.assessmentName }} 题数： @@ -184,6 +184,8 @@ export default { const closeDrawer = () => { ctx.emit("update:addinvistVisible", false); ctx.emit("update:edit", false); + state.assessment = null; + state.assessment1 = null; state.inputV1 = ""; // ctx.emit("changeData", false); localStorage.setItem("stageId", props.chooseStageId); @@ -205,6 +207,7 @@ export default { api .queryAppraiseDetailById({ assessmentId: props.EditInvistId }) .then((res) => { + console.log(res) //更新讨论信息 state.assessment1 = res.data.data; }) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index fb000e45..e0d43355 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -427,11 +427,11 @@
开始时间
-
{{ item.createTime }}
+
{{item.createTime?toDate(Number(item.createTime),"Y-M-D"):'---'}}
- {{ item.finishStuCnt }}/{{ item.totalStuCnt }}人 + {{ item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 }}/{{ item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0 }}人
{{ - (item.finishStuCnt / item.totalStuCnt) * 100 + (item.finishStuCnt&&item.finishStuCnt!==null?item.finishStuCnt:0 / item.totalStuCnt&&item.totalStuCnt!==null?item.totalStuCnt:0) * 100 }}%
@@ -3248,8 +3248,10 @@ export default { }).then((res) => { console.log("get task", res.data.data); let info = res.data.data.projectInfo; - let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); - let end = toDate(info.endTime / 1000, "Y-M-D h:m"); + // let start = toDate(info.beginTime / 1000, "Y-M-D h:m"); + let start = info.beginTime + // let end = toDate(info.endTime / 1000, "Y-M-D h:m"); + let end = info.endTime state.tstartTime = info.beginTime; state.tendTime = info.endTime; state.tsourceBelong = info.sourceBelongId; @@ -3823,6 +3825,7 @@ export default { templateProject, changeGrouped, deFile, + toDate }; }, };