diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 30a008350..521115735 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -767,6 +767,7 @@ class ProjectController extends AbstractController 'parent_id' => $task->id, 'project_id' => $task->project_id, 'column_id' => $task->column_id, + 'owner' => [User::userid()] ]); $data = [ 'new_column' => null, diff --git a/resources/assets/js/pages/manage/components/TaskRow.vue b/resources/assets/js/pages/manage/components/TaskRow.vue index fd336c41c..c0264cded 100644 --- a/resources/assets/js/pages/manage/components/TaskRow.vue +++ b/resources/assets/js/pages/manage/components/TaskRow.vue @@ -12,6 +12,7 @@
@@ -51,12 +52,21 @@
{{item.name}}
-
{{item.file_num}}
-
{{item.msg_num}}
-
-
- - {{item.sub_complete}}/{{item.sub_num}} +
+ +
+
+ + {{item.file_num}} +
+
+ + {{item.msg_num}} +
+
+ + {{item.sub_complete}}/{{item.sub_num}} +
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue index 625203cad..e9edbbce8 100644 --- a/resources/assets/js/pages/manage/dashboard.vue +++ b/resources/assets/js/pages/manage/dashboard.vue @@ -30,13 +30,18 @@ -
{{item.name}}
-
- {{expiresFormat(item.end_at)}} +
{{item.name}}
+
+ +
+
+ + {{item.sub_complete}}/{{item.sub_num}} +
+
+ + {{expiresFormat(item.end_at)}}
diff --git a/resources/assets/sass/iconfont.scss b/resources/assets/sass/iconfont.scss index 371de8a9e..76ab4696d 100644 --- a/resources/assets/sass/iconfont.scss +++ b/resources/assets/sass/iconfont.scss @@ -1,8 +1,8 @@ @font-face { font-family: 'iconfont'; /* Project id 2583385 */ - src: url('//at.alicdn.com/t/font_2583385_twblip3um0q.woff2?t=1624439217605') format('woff2'), - url('//at.alicdn.com/t/font_2583385_twblip3um0q.woff?t=1624439217605') format('woff'), - url('//at.alicdn.com/t/font_2583385_twblip3um0q.ttf?t=1624439217605') format('truetype'); + src: url('//at.alicdn.com/t/font_2583385_q96au6w9mi.woff2?t=1624526227684') format('woff2'), + url('//at.alicdn.com/t/font_2583385_q96au6w9mi.woff?t=1624526227684') format('woff'), + url('//at.alicdn.com/t/font_2583385_q96au6w9mi.ttf?t=1624526227684') format('truetype'); } .iconfont { diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index e1c0c209f..63eb62da8 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -119,7 +119,7 @@ color: $primary-color; border-radius: 6px; border: 1px solid $primary-color; - background-color: #e6f7ff; + background-color: rgba($primary-color, 0.1); transition: left 0.2s; } > div { @@ -569,7 +569,9 @@ } } &.row-name { - padding-left: 34px; + align-items: flex-start; + padding: 12px 12px 12px 34px; + line-height: 24px; .drop-icon { position: relative; } @@ -592,7 +594,6 @@ cursor: pointer; font-size: 16px; color: #cccccc; - margin-right: 8px; &.completed { color: $primary-color; } @@ -600,6 +601,7 @@ font-size: 16px; width: 16px; height: 16px; + margin-top: 4px; margin-left: -20px; margin-right: 4px; color: #cfcfcf; @@ -611,47 +613,26 @@ } .item-title { flex: 1; - padding: 0 22px 0 0; + padding: 0 22px 0 8px; cursor: pointer; } - .item-sub-num { - flex-shrink: 0; - cursor: pointer; - display: flex; - align-items: center; - margin-left: 8px; - border: 1px solid #e8e8e8; - background-color: #ffffff; - padding: 0 6px 0 5px; - border-radius: 4px; - height: 20px; - line-height: 18px; - font-size: 12px; - .ivu-icon { - transform: scale(0.9); - font-size: 12px; - color: #333333; - margin-right: 4px; - } - } .item-icons { display: flex; align-items: center; margin-left: 4px; flex-shrink: 0; .item-icon { + display: flex; font-size: 12px; - margin-left: 8px; - color: #777777; - .ivu-icon, + margin-left: 16px; + color: #aaaaaa; + cursor: pointer; .iconfont { - margin-left: 2px; - margin-right: 0; - font-size: 14px; - color: #666666; + font-size: 12px; } - .iconfont { - color: #999999; + > em { + font-style: normal; + margin-left: 4px; } } } diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss index 65a8a40ce..4f5c677fe 100644 --- a/resources/assets/sass/pages/page-dashboard.scss +++ b/resources/assets/sass/pages/page-dashboard.scss @@ -86,6 +86,7 @@ padding: 0 12px; overflow: auto; > li { + position: relative; list-style: none; display: flex; background: #F9FAFB; @@ -100,6 +101,14 @@ &:last-child { margin-bottom: 12px; } + .priority-color { + position: absolute; + top: 50%; + transform: translateY(-50%); + left: 0; + height: 12px; + width: 2px; + } .el-dropdown { flex-shrink: 0; width: 22px; @@ -115,25 +124,27 @@ padding-left: 6px; line-height: 22px; } - .item-time { + .item-icon { display: flex; align-items: center; - height: 22px; - line-height: 22px; font-size: 13px; - margin-left: 12px; - flex-shrink: 0; + margin-left: 16px; + height: 22px; color: #aaaaaa; + cursor: pointer; + .iconfont { + font-size: 13px; + } + > em { + font-style: normal; + margin-left: 4px; + } &.overdue { color: #ed4014; } &.today { color: #ff9900; } - .ivu-icon { - margin-right: 3px; - font-size: 14px; - } } } }