From 1eb8989b8b0be3453671b2dbc695541dec233554 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 10:56:36 +0800 Subject: [PATCH 01/12] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E9=98=B6=E6=AE=B5=E4=BB=BB=E5=8A=A1=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/SeeStu.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 0a546d83..748f4191 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -302,6 +302,7 @@ export default { ? "投票" : "-", name: value.name, + projectTaskId: value.projectTaskId, complete: value.status == -1 ? "未开始" @@ -316,6 +317,8 @@ export default { }; array.push(obj); }); + array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId}) + console.log('我排序了吗--------------------------》', array) return array; }; const setStageList = (tableData) => { From 6e9d5c3e5926aefef4e171db9d506f77fceb860e Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 17 Jan 2023 12:58:10 +0800 Subject: [PATCH 02/12] --fix bug --- src/components/drawers/project/ProjectFaceTaskManage.vue | 4 ++-- src/components/drawers/router/RouterFaceTeachManage.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 38feca10..f57a2136 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -162,9 +162,9 @@ diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 43d1a8e8..7c0ae81a 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -139,9 +139,9 @@ From d258104af169d14da48c55117bc2e5fbbed7d2c9 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 17 Jan 2023 13:12:57 +0800 Subject: [PATCH 03/12] --fix bug --- src/components/drawers/project/ProjectHomeWorkManage.vue | 2 +- src/components/drawers/router/RouterHomeworkManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 829ee738..baf63238 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -569,7 +569,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.projectTaskInfo.stageId - }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}` + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskType=${4}&taskId=${props.projectTaskInfo.projectTaskId}` ); // api // .exportTaskStudent({ diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index fff442af..97a2b0bf 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -560,7 +560,7 @@ export default { `${ process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${ props.datasource.chapterId - }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}` + }&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${props.datasource.routerTaskId}` ); // api // .exportTaskStudent({ From e877e2e6c413d7e9b7f0aceb80a89724aa8e615a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 17 Jan 2023 15:13:32 +0800 Subject: [PATCH 04/12] --fix bug --- src/views/courselibrary/CoursewareManage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 428af0af..7fa46255 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2780,8 +2780,8 @@ const columns6 = [ // 新加学员数 { title: "学员数", - dataIndex: "createName", - key: "createName", + dataIndex: "studentCnt", + key: "studentCnt", width: 100, align: "center", ellipsis: true, From d472e37dafffa8aa79f5be64426e704a16d5e3f6 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 17 Jan 2023 15:20:41 +0800 Subject: [PATCH 05/12] --fix bug --- src/api/ThirdApi.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index 4158b413..e0b7558f 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,4 +1,5 @@ -export const USER_LIST = '/userbasic/user/list post' +// export const USER_LIST = '/userbasic/user/list post' +export const USER_LIST = '/userbasic/user/searchList post' export const ORG_LIST = '/userbasic/org/list post' export const ORG_CHILD_LIST = '/userbasic/org/info post' export const AUDIENCE_LIST = '/userbasic/audience/list post' \ No newline at end of file From 0d9f91ca79bdc9b5a6207991a1f648263c357a73 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 15:31:14 +0800 Subject: [PATCH 06/12] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E5=AF=B9=E5=AD=A6=E5=91=98=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=BE=97=E6=93=8D=E4=BD=9C-=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E3=80=81=E6=8B=92=E7=BB=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 3fbeda80..41510e4e 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -196,7 +196,7 @@ :scroll="{ x: 1500 }" row-key="id" :row-selection="stuRowSelection" - > + >