From 242d996652392abadb9b2c73774e4ebaea386edb Mon Sep 17 00:00:00 2001 From: quhongwei <1632078442@qq.com> Date: Tue, 28 Feb 2023 10:05:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=8A=B6=E6=80=81=E5=80=BC=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=89=80=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/router/RouterExaminationManage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 33fb498c..a70b6dd3 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -286,7 +286,7 @@ export default { align: "center", ellipsis: true, className: "h", - customRender: ({record:{finishStatus}}) => ({1:'已完成',0:'未开始',9:'已完成'}[finishStatus] || '未开始'), + customRender: ({record:{status}}) => ({1:'已完成',0:'未开始',9:'已完成'}[status] || '未开始'), }, { title: "操作", @@ -299,7 +299,7 @@ export default { customRender: (text) => { {/* debugger */ } console.log("text" + text.record) - if (text.record.finishStatus === 1 || text.record.finishStatus === 9) { + if (text.record.status === 1 || text.record.status === 9) { return (
Date: Tue, 28 Feb 2023 10:13:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=92=8C=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 7 +- src/views/projectcenter/TaskPage.vue | 115 +++++++++++++-------------- 2 files changed, 59 insertions(+), 63 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index d34fcdf5..ce23da6c 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -10,13 +10,13 @@
创建时间：{{ cretime }}
- -
+
-
+
查看 - {{ record.topFlag ? "取消优秀" : "优秀学员" }}
-
+
+添加证书
{ - console.log("阶段列表", res); - for (let i = 0; i < res.data.data.stageList.length; i++) { - for ( - let k = 0; - k < res.data.data.stageList[i].taskList.length; - k++ - ) { - if (res.data.data.stageList[i].taskList[k].name == "面授") { - state.morFaceT = true; - break; - } - } + console.log("阶段列表", res); + for (let i = 0; i < res.data.data.stageList.length; i++) { + for (let k = 0; k < res.data.data.stageList[i].taskList.length; k++) { + if (res.data.data.stageList[i].taskList[k].name == "面授") { + state.morFaceT = true; + break; } - levelList.stageList = res.data.data.stageList; - if (levelList.stageList.length === 1) { - // 无解段任务 - state.rankjieduan = [{ value: 0, label: "无阶段" }]; - state.valuestu2 = 0; - } else { - // 有阶段任务 - console.log(levelList.stageList); - let arrStage = []; - for (let i = 0; i < levelList.stageList.length; i++) { - if (levelList.stageList[i].id !== "0") { - let obj = { - value: levelList.stageList[i].id, - label: levelList.stageList[i].name, - }; - arrStage.push(obj); - } - } - state.rankjieduan = arrStage; - state.valuestu2 = arrStage[0].value; - state.choosedStageName = levelList.stageList[0].name; + } + } + levelList.stageList = res.data.data.stageList; + if (levelList.stageList.length === 1) { + // 无解段任务 + state.rankjieduan = [{ value: 0, label: "无阶段" }]; + state.valuestu2 = 0; + } else { + // 有阶段任务 + console.log(levelList.stageList); + let arrStage = []; + for (let i = 0; i < levelList.stageList.length; i++) { + if (levelList.stageList[i].id !== "0") { + let obj = { + value: levelList.stageList[i].id, + label: levelList.stageList[i].name, + }; + arrStage.push(obj); } - //暂时传个固定的id用 到时候看数据里面是否有在更换 - // 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; - console.log("11-22-33", taskarr); - if (taskarr.length == 1) { - if (taskarr[0].id == "0") { - taskarr[0].name = "无阶段任务"; - } - } - state.taskSyllabus = taskarr; + } + state.rankjieduan = arrStage; + state.valuestu2 = arrStage[0].value; + state.choosedStageName = levelList.stageList[0].name; + } + //暂时传个固定的id用 到时候看数据里面是否有在更换 + // 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; + console.log("11-22-33", taskarr); + if (taskarr.length == 1) { + if (taskarr[0].id == "0") { + taskarr[0].name = "无阶段任务"; } - }) + } + state.taskSyllabus = taskarr; + } + }); }; //学员学员管理渲染 // const getTableDate = () => { From e38ba60d88d93d345a79783868c0ed3f4fd2621a Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 28 Feb 2023 10:15:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 0b3ac2f4..8cc62e43 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1473,7 +1473,7 @@ export default { customRender: (value) => { return (
- {value.record.status === 3 + {value.record.status === 3 || value.record.status === 2 || value.record.status === -5 || value.record.status === 1 ? { 0: "草稿", 1: "提交待审核", @@ -1482,6 +1482,10 @@ export default { 4: "发布", "-1": "已结束", "-6": "撤回已结束", + "-2": "删除", + "-3": "撤回审核", + "-4": "撤回发布", + "-5": "拒绝", }[value.record.status + ""] || "" : "-"}