From e6ebf1d79930d04651deb8e455cfe95a240b3468 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 21 Feb 2023 18:43:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ExportScore.vue | 11 +++++++++-- .../drawers/project/ProjectHomeWorkManage.vue | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index f7336e83..c89e0734 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -38,6 +38,7 @@ :data="{ type: type, taskId: Number(id), + workId: datesource.info.id, targetId: Number(id), }" > @@ -149,8 +150,7 @@ display: flex; align-items: center; width: 500px; - height: 40px; - " + height: 40px;" :style="{ background: errNum ? 'rgba(255, 116, 116, 0.1)' @@ -200,6 +200,12 @@ export default { type: Boolean, default: false, }, + datesource: { + type: Object, + default: function () { + return {}; + }, + }, //type=3:面授课 type: { type: String, @@ -241,6 +247,7 @@ export default { const afterVisibleChange = (bool) => { console.log("state", bool); + console.log(props.datesource) }; //上传文件 diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index e9897153..d7ca59fe 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -135,6 +135,7 @@ :type="1" :id="projectTaskInfo?.id" :pid="projectTaskInfo?.projectId" + :datesource="projectTaskInfo" v-model:searchTaskList="searchTaskList" /> From 3f3b78e3d757c2fe21a0645edbdda49db0481337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Tue, 21 Feb 2023 21:48:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 8 ++++---- src/views/projectcenter/TaskPage.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 834d2b4a..01cc64a7 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -144,8 +144,8 @@
{{ routerInfoOverview.onlineCourseCnt - }}% + }} +
在线课程数
@@ -153,8 +153,8 @@
{{ routerInfoOverview.offLineCourseCnt - }}% + }} +
面授课程数
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 729d930e..8af24599 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -291,8 +291,8 @@
{{ projectInfoOverview.onlineCourseCnt - }}% + }} +
在线课程数
@@ -300,8 +300,8 @@
{{ projectInfoOverview.offLineCourseCnt - }}% + }} +
面授课程数
From 2e88a378af1a739f70ccd1a0d2e654bbff1c9b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Tue, 21 Feb 2023 22:41:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 01cc64a7..45c7c4fa 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2243,6 +2243,7 @@ export default { levelList.routerInfoOverview[item] = res.data.data.routerInfoOverview[item] || 0; }); + console.log("学习路径图概览数据获取1", levelList); Object.keys(res.data.data.chapterOverviewList).forEach((item) => { levelList.chapterOverviewList[item] = res.data.data.chapterOverviewList[item] || 0; From 031c9006cf4b6c59ba1b253b622831846c2a48a2 Mon Sep 17 00:00:00 2001 From: lpq Date: Tue, 21 Feb 2023 22:41:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/MemberList.vue | 3 ++- src/views/projectcenter/TaskAdd.vue | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 8b474718..7195d97c 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -8,7 +8,7 @@ >
-
组员名单
+
组员名单1
{ + debugger let obj = { projectGroupId: props.chooseGroupId, projectId: props.projectId, diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index b2d47fd5..c4303b9c 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -250,19 +250,19 @@ ">
- 编辑 - - + + + + + + 删除