From 2e7ff88be6222f8254ebbb3b362a563a59bdddc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com> Date: Mon, 14 Mar 2022 14:34:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=94=98=E7=89=B9=E5=9B=BE=E5=8E=BB=E6=8E=89?= =?UTF-8?q?'=E5=B7=B2=E5=AE=8C=E6=88=90'=E4=BB=BB=E5=8A=A1=E5=8F=8A?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/manage/components/ProjectGantt.vue | 3 ++- .../pages/manage/components/ProjectList.vue | 4 ++-- .../sass/pages/components/gantt-view.scss | 3 ++- .../sass/pages/components/project-list.scss | 19 ++++++++++++++----- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ProjectGantt.vue b/resources/assets/js/pages/manage/components/ProjectGantt.vue index 5187df77b..6d96d5406 100644 --- a/resources/assets/js/pages/manage/components/ProjectGantt.vue +++ b/resources/assets/js/pages/manage/components/ProjectGantt.vue @@ -135,7 +135,7 @@ export default { // let color = '#058ce4'; if (taskData.complete_at) { - color = '#c1c1c1'; + return; } else { // 等级颜色 this.levelList.some(level => { @@ -230,6 +230,7 @@ export default { } else { this.lists.some((task) => { if (task.id == item.id) { + this.$set(task, 'time', item.backTime); return true; } }) diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index c9bfa2afc..6c4717bbc 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -88,8 +88,8 @@
- - {{ $L('甘特图') }} + +
diff --git a/resources/assets/sass/pages/components/gantt-view.scss b/resources/assets/sass/pages/components/gantt-view.scss index 56535ccaa..310b1bc69 100644 --- a/resources/assets/sass/pages/components/gantt-view.scss +++ b/resources/assets/sass/pages/components/gantt-view.scss @@ -78,7 +78,7 @@ .item-title { flex: 1; padding-right: 12px; - cursor: default; + cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -238,6 +238,7 @@ white-space: nowrap; margin-left: 4px; margin-right: 10px; + cursor:pointer; } .timeline-resizer { height: 22px; diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index 0f990d207..f204869ae 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -240,16 +240,25 @@ } } } - .project-gantt-item{ - padding-left:5px; - &.active{ + + .project-gantt-item { + padding-left: 5px; + display: flex; + + &.active { color: $primary-color; } - .force-right{ - &.act{ + + .force-right { + &.act { color: #2A53FF; } } + + .gantt-name { + font-size: 13px; + padding-top: 6%; + } } } }