From c3b09e61c7b7cecbb9bec0e55ce00839886eb10c Mon Sep 17 00:00:00 2001 From: dongwug Date: Fri, 11 Nov 2022 09:22:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B7=B3=E8=BD=AC=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CreVote.vue | 6 +- src/components/windows/DelWins.vue | 161 --------------------------- src/views/projectcenter/TaskPage.vue | 70 ++++++++---- 3 files changed, 50 insertions(+), 187 deletions(-) delete mode 100644 src/components/windows/DelWins.vue diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index cdcd309d..56cf411d 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -38,7 +38,7 @@
-
删除题干
+
删除题干
@@ -109,8 +109,6 @@ import * as api from "../../api/indexVote"; import { message } from "ant-design-vue"; export default { name: "CreVote", - // components: { - // }, props: { crevoteVisible: { type: Boolean, @@ -138,7 +136,6 @@ export default { }, ], }); - const addQue = () => { state.questions.push({ stemTit: "题干", @@ -168,7 +165,6 @@ export default { // delete value[0] value.pop() } - const closeDrawer = () => { ctx.emit("update:crevoteVisible", false); }; diff --git a/src/components/windows/DelWins.vue b/src/components/windows/DelWins.vue deleted file mode 100644 index de5ca5c2..00000000 --- a/src/components/windows/DelWins.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index dbd5e4b6..75e3e4c5 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -220,14 +220,16 @@
任务大纲
- - + + + +
- + - + @@ -1056,9 +1066,16 @@ - + - + @@ -1812,7 +1829,7 @@ export default { selectedRowKeys: [], //选择的学员 selectedRows: [], //选择的学员的id值 chooseDeleteOne: [], //删除的单个学员id - projectTaskId:"", //项目任务id + projectTaskId: "", //项目任务id //进度排行学员 rankjindu: [{ value: "学员", label: "学员" }], valuestu1: "学员", @@ -1874,7 +1891,7 @@ export default { noticeChecked: true, noticeContent: "", TaskFaceImpStuvisible: false, //批量面授报名 - + morFaceT:true, //批量面授报名按钮 //进度排行表 jindutabledata: [ { @@ -2342,7 +2359,6 @@ export default { level: null, //项目级别 systemId: null, //培训体系 picUrl: null, - }); // 输入接入 -- start -- @@ -2363,15 +2379,20 @@ export default { if (res.status == 200) { console.log("res", res); console.log("阶段列表", res.data.data.stageList); - console.log('任务id',res.data.data.stageList[0].taskList[0].projectTaskId) - //taskList[num] num应该是点那个就是那个数 - state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId + console.log( + "任务id", + res.data.data.stageList[0].taskList[0].projectTaskId + ); + //taskList[num] num应该是点那个就是那个数 + state.projectTaskId = + res.data.data.stageList[0].taskList[0].projectTaskId; let leng = res.data.data.stageList.length; if (leng > 0) { //获取任务列表 阶段 let taskarr = res.data.data.stageList; state.taskSyllabus = taskarr; - // console.log(res.data.data.stageList[0].taskList[0].type, "ggg"); + console.log("123456789", state.taskSyllabus); + // console.log(res.data.data.stageList[0].taskList[0].name, "ggg"); } } }) @@ -3046,7 +3067,14 @@ export default { state.checkedSty = info.courseSyncFlag == 1 ? true : false; state.checkedBOEU = info.boeFlag == 1 ? true : false; state.picUrl = info.picUrl; - state.sourceBelong = info.sourceBelongId==1?"项目一":info.sourceBelongId==2?"项目二":info.sourceBelongId==3?"项目三":"-" + state.sourceBelong = + info.sourceBelongId == 1 + ? "项目一" + : info.sourceBelongId == 2 + ? "项目二" + : info.sourceBelongId == 3 + ? "项目三" + : "-"; }); }); return { From b5f3c234c95ab2259e9e2b6157a8604ab03503b6 Mon Sep 17 00:00:00 2001 From: dongwug Date: Fri, 11 Nov 2022 14:36:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E6=89=B9=E9=87=8F=E5=85=8D=E5=8F=97=E5=88=A4?= =?UTF-8?q?=E6=96=AD=20=E6=93=8D=E4=BD=9C=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=97=E8=A1=A8=E6=B8=B2=E6=9F=93=E5=92=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E9=87=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CreVote.vue | 2 +- src/components/drawers/FaceManage.vue | 175 +++++++++---------- src/components/drawers/TestManage.vue | 215 ++++++++++------------- src/components/drawers/TimeManage.vue | 206 +++++++++++----------- src/components/drawers/WorkManage.vue | 235 +++++++++++--------------- src/views/projectcenter/TaskPage.vue | 78 ++++----- 6 files changed, 413 insertions(+), 498 deletions(-) diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index 56cf411d..29c1fe21 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -38,7 +38,7 @@
-
删除题干
+
删除题干
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index cdb61889..d159102b 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -41,11 +41,15 @@
-
+
搜索
-
+
重置
@@ -158,7 +162,7 @@ export default { type: Boolean, default: false, }, - ProjectTaskId: { + projectTaskId: { type: Number, default: null, }, @@ -176,6 +180,7 @@ export default { showdonemodal: false, open: false, selectedRowKeys: [], + projectName: "", projectNameList: [ { id: 1, @@ -199,108 +204,36 @@ export default { }, ], tabledata: [ - { - key: 1, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "-", - state: "未完成", - }, - { - key: 2, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "-", - state: "未完成", - }, - { - key: 3, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "合格", - state: "完成", - }, - { - key: 4, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "合格", - state: "完成", - }, - { - key: 5, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "合格", - state: "完成", - }, - { - key: 6, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "合格", - state: "完成", - }, - { - key: 7, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "合格", - state: "完成", - }, - { - key: 8, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "不合格", - state: "完成", - }, - { - key: 9, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "不合格", - state: "完成", - }, - { - key: 10, - name: "哈哈", - bum: "产品部", - gangw: "产品经理", - score: "不合格", - state: "完成", - }, + // { + // key: 1, + // name: "哈哈", + // bum: "产品部", + // gangw: "产品经理", + // score: "-", + // state: "未完成", + // }, ], tablecolumns: [ { title: "姓名", - dataIndex: "name", - key: "name", + dataIndex: "userName", + key: "userName", width: 50, align: "left", className: "h head", }, { title: "所在部门", - dataIndex: "bum", - key: "bum", + dataIndex: "deptName", + key: "userName", width: 60, align: "center", className: "h", }, { title: "所在岗位", - dataIndex: "gangw", - key: "gangw", + dataIndex: "jobName", + key: "jobName", width: 60, align: "center", className: "h", @@ -315,8 +248,8 @@ export default { }, { title: "任务状态", - dataIndex: "state", - key: "state", + dataIndex: "status", + key: "status", width: 60, align: "center", className: "h", @@ -325,6 +258,7 @@ export default { }); const selectProjectName = (value, index) => { console.log("value", value, index); + state.projectName = value }; const closeDrawer = () => { ctx.emit("update:Fvisible", false); @@ -371,26 +305,67 @@ export default { name: "", pageNo: 0, pageSize: 0, - projectTaskId: props.ProjectTaskId, + projectTaskId: props.projectTaskId, status: 0, }; - console.log('9999999999999',obj.projectTaskId); api .taskStudentList(obj) .then((res) => { - console.log('获取任务管理列表成功', res); - + console.log("获取面授任务管理列表成功", res); + // state.pageNo = res.data.data.pageNo + state.pageSize = res.data.data.pageSize; + state.pageSize = res.data.data.pageSize; + // for (let i = 0; i < res.data.data.rows.length; i++) { + // state.tabledata.push(res.data.data.rows[i].userInfoBo); + // } + for (let i = 0; i < res.data.data.rows.length; i++) { + state.tabledata.push(res.data.data.rows[i]); + //需要确认值 赋给tablecolumns + console.log('state.tabledata',state.tabledata); + } }) .catch((err) => { - console.log("获取任务列表失败",err) - }) + console.log("获取面授任务列表失败", err); + }); }; + + //搜索任务列表 + const searchTaskList = () => { + let objser = { + name: state.name, + pageNo: 0, + pageSize: 0, + projectTaskId: props.projectTaskId, + status: state.projectName, + }; + api + .taskStudentList(objser) + .then((res) => { + console.log("获取任务管理列表成功", res); + // state.pageNo = res.data.data.pageNo + state.pageSize = res.data.data.pageSize; + state.pageSize = res.data.data.pageSize; + for (let i = 0; i < res.data.data.rows.length; i++) { + state.tabledata.push(res.data.data.rows[i].userInfoBo); + } + }) + .catch((err) => { + console.log("获取任务列表失败", err); + }); + }; + + //重置任务列表 + const resetTaskList = () => { + state.name = "", + state.projectName=""; + getManageList(); + }; let timer; onMounted(() => { setTimeout(() => { - getManageList() - },1000) + getManageList(); + }, 1000); timer = setInterval(() => { state.open = false; }, 3000); @@ -411,6 +386,8 @@ export default { closedoneModal, showopen, getManageList, + searchTaskList, + resetTaskList, }; }, }; diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 072f1b21..f8619fbd 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -8,7 +8,7 @@ >
-
{{ title }}
+
【{{ title }}】管理
-
+
搜索
-
+
重置
@@ -108,6 +108,7 @@