diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index a72ceee6..ca3e9f5f 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -67,8 +67,6 @@ class ProjectController extends AbstractController
"owner": 1, // 是否项目负责人
"owner_userid": 1, // 项目负责人ID
- "project_user": [], // 为空,数据在one接口返回
-
"task_num": 9,
"task_complete": 0,
"task_percent": 0,
@@ -118,9 +116,7 @@ class ProjectController extends AbstractController
//
$list = $builder->orderByDesc('projects.id')->paginate(Base::getPaginate(100, 50));
$list->transform(function (Project $project) use ($user) {
- return array_merge($project->toArray(), $project->getTaskStatistics($user->userid), [
- 'project_user' => []
- ]);
+ return array_merge($project->toArray(), $project->getTaskStatistics($user->userid));
});
//
$data = $list->toArray();
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index a60156ce..4f6fc25a 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -8,13 +8,30 @@
- -
-
-
{{$L('项目负责人')}}
-
+ -
+
+ -
+
+
{{$L('项目负责人')}}
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
-
-
+
+
+
-
@@ -65,7 +82,7 @@
userid != projectData.owner_userid)
+ },
+
+ projectUserShowNum() {
+ return this.windowMax768 ? 3 : 10;
+ },
+
columnList() {
const {projectId, columns, tasks} = this;
const list = columns.filter(({project_id}) => {
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index d1b364b3..4e44a626 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -521,6 +521,9 @@ export default {
if (index > -1) {
state.projects.splice(index, 1, Object.assign({}, state.projects[index], data));
} else {
+ if (typeof data.project_user === "undefined") {
+ data.project_user = []
+ }
state.projects.push(data);
}
setTimeout(() => {
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index 4373ee97..c3034259 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -50,6 +50,56 @@
&:hover {
box-shadow: 0 0 6px #cccccc;
}
+ &.project-avatar {
+ width: auto;
+ min-width: 36px;
+ &:hover {
+ box-shadow: none;
+ }
+ > ul {
+ display: flex;
+ align-items: center;
+ > li {
+ list-style: none;
+ margin-left: -6px;
+ transition: transform 0.2s;
+ &:hover {
+ transform: scale(1.1);
+ }
+ &:first-child {
+ margin-left: 0;
+ }
+ &.more,
+ &.add {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 17px;
+ width: 32px;
+ height: 32px;
+ border-radius: 50%;
+ color: #b4bcce;
+ background-color: #fff;
+ font-weight: 700;
+ border: 2px dashed #8bcf70;
+ cursor: pointer;
+ z-index: 1;
+ > i {
+ color: #8bcf70
+ }
+ }
+ &.more {
+ width: 30px;
+ transform: translateX(-1px);
+ background-color: transparent;
+ border-color: transparent;
+ &:hover {
+ transform: scale(1);
+ }
+ }
+ }
+ }
+ }
&.project-icon {
border-radius: 50%;
background-color: #F2F3F5;