From 47648682a59fee6ec955f9bc243bd2537bd4a7de Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 19 Dec 2022 18:27:24 +0800 Subject: [PATCH 1/6] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=92=8C=E6=9C=80=E5=90=8E=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index ce26f4c2..4bf504cb 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1729,11 +1729,13 @@ export default { align: "center", className: "h", ellipsis: true, + customRender: ({record}) =>
{record.finishTaskNum}/{record.totalTaskNum}
+ }, { title: "最近学习时间", - dataIndex: "stutime", - key: "stutime", + dataIndex: "lastStudyTime", + key: "lastStudyTime", width: 80, align: "center", className: "h", From 790030d8d19f8e0675f7d8836e33e963bd9234a5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 19 Dec 2022 19:35:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=80=89=E6=8B=A9=E9=98=B6=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 1cc63a5a..a6ea1333 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -478,7 +478,7 @@ const resetAudienceInfo = () => { // }; //确定添加授权 const submitAuth = () => { - if (props.type !== 3) { + if (props.type === 2) { stageVisible.value = true } else { handleStageOk() From 78ecfd3d6a2338de6dd22f5b6ba8f2635b3c09ca Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 19 Dec 2022 19:41:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=B3=AA=E9=A3=99?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index a6ea1333..57aca2bc 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -241,7 +241,7 @@ const { loading: stuLoading, total: stuTotal } = useBoeApiPage(USER_LIST, nameSearch.value, { - init: true, + init: false, result: res => res.result.userInfoList, totalPage: res => res.result.totalPage, total: res => res.result.totalElement @@ -260,7 +260,7 @@ const { loading: audiLoading, total: audiTotal } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, { - init: true, + init: false, result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})), totalPage: res => res.result.totalPage, total: res => res.result.totalElement From d7aa5fc85616f91302cb8ccfedcb29a85ab74c31 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 19 Dec 2022 19:56:27 +0800 Subject: [PATCH 4/6] -- bug --- src/views/projectcenter/ProjectManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 2964c0a0..4240bca5 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -974,7 +974,7 @@ export default { return; } */ const offName = await validateName({ - name: state.qdms_inputV1, + name: state.projectInfo.name, type: 1, id: state.projectInfo.projectId, }).then((res) => { From dd9c9cbf4cceedfc752d88cb8ba66f071ab176fa Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 19 Dec 2022 20:18:14 +0800 Subject: [PATCH 5/6] -- bug --- src/views/projectcenter/ProjectAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 8c4edc69..df820a9b 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -357,7 +357,7 @@ export default { ...res.data.data.projectInfo, ...state.projectInfo, }; - state.projectInfo.name = '' + routers.query.parentId && (state.projectInfo.name = '') state.projectInfo.rangeTime = [ state.projectInfo.beginTime, state.projectInfo.endTime, From 7fa58cdea1be786f02cbeb410eb542fec78d392c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 19 Dec 2022 20:38:02 +0800 Subject: [PATCH 6/6] -- bug --- src/views/projectcenter/ProjectAdd.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index df820a9b..698f067f 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -357,7 +357,6 @@ export default { ...res.data.data.projectInfo, ...state.projectInfo, }; - routers.query.parentId && (state.projectInfo.name = '') state.projectInfo.rangeTime = [ state.projectInfo.beginTime, state.projectInfo.endTime,