From 4ef713a0bfee6d925705c6fd14df91494a22ce0f Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 10 Jun 2021 18:54:11 +0800 Subject: [PATCH] no message --- .../Controllers/Api/ProjectController.php | 36 +++++- resources/assets/js/pages/manage.vue | 38 +++++- .../pages/manage/components/ProjectList.vue | 3 +- .../pages/manage/components/TaskAddSimple.vue | 3 +- resources/assets/js/store/mutations.js | 37 +++++- resources/assets/sass/pages/page-manage.scss | 111 +++++++++++++----- 6 files changed, 187 insertions(+), 41 deletions(-) diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 0a555c0f..f1380a64 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -55,7 +55,41 @@ class ProjectController extends AbstractController } /** - * 项目详情 + * 单个项目信息 + * + * @apiParam {Number} project_id 项目ID + */ + public function one() + { + $user = User::authE(); + if (Base::isError($user)) { + return $user; + } else { + $user = User::IDE($user['data']); + } + // + $project_id = intval(Request::input('project_id')); + // + $project = Project::with(['projectColumn' => function($query) { + $query->with(['projectTask' => function($taskQuery) { + $taskQuery->with(['taskUser', 'taskTag'])->where('parent_id', 0); + }]); + }, 'projectUser']) + ->select($this->projectSelect) + ->join('project_users', 'projects.id', '=', 'project_users.project_id') + ->where('projects.id', $project_id) + ->where('project_users.userid', $user->userid) + ->first(); + if ($project) { + $owner_user = $project->projectUser->where('owner', 1)->first(); + $project->owner_userid = $owner_user ? $owner_user->userid : 0; + } + // + return Base::retSuccess('success', $project); + } + + /** + * 单个项目详情（比"单个项目信息"多） * * @apiParam {Number} project_id 项目ID */ diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index a77ca2b3..714c982c 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -33,9 +33,28 @@
  • @@ -122,7 +141,9 @@ export default { path: 'priority', name: '任务等级' } - ] + ], + + openMenu: {} } }, @@ -168,6 +189,10 @@ export default { this.goForward({path: '/manage/' + path}); }, + toggleOpenMenu(id) { + this.$set(this.openMenu, id, !this.openMenu[id]) + }, + settingRoute(path) { if (path === 'signout') { $A.modalConfirm({ @@ -182,9 +207,10 @@ export default { this.toggleRoute('setting/' + path); }, - classNameRoute(path) { + classNameRoute(path, openMenu) { return { - "active": $A.leftExists(this.curPath, '/manage/' + path) + "active": $A.leftExists(this.curPath, '/manage/' + path), + "open-menu": openMenu === true, }; }, diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 371003e1..ab0ce984 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -607,7 +607,6 @@ export default { success: ({ret, data, msg}) => { if (ret === 1) { $A.messageSuccess(msg); - this.addTaskSuccess(data) this.addShow = false; this.addData = { owner: 0, @@ -618,6 +617,8 @@ export default { p_name: '', p_color: '', }; + this.$store.commit('getProjectOne', data.project_id); + this.addTaskSuccess(data) } else { $A.modalError(msg); } diff --git a/resources/assets/js/pages/manage/components/TaskAddSimple.vue b/resources/assets/js/pages/manage/components/TaskAddSimple.vue index 18443c6a..7afa1ef8 100644 --- a/resources/assets/js/pages/manage/components/TaskAddSimple.vue +++ b/resources/assets/js/pages/manage/components/TaskAddSimple.vue @@ -161,7 +161,6 @@ export default { success: ({ret, data, msg}) => { if (ret === 1) { $A.messageSuccess(msg); - this.$emit("on-success", data) this.active = false; this.addData = { owner: 0, @@ -172,6 +171,8 @@ export default { p_name: '', p_color: '', } + this.$store.commit('getProjectOne', data.project_id); + this.$emit("on-success", data) } else { $A.modalError(msg); } diff --git a/resources/assets/js/store/mutations.js b/resources/assets/js/store/mutations.js index 6c24b432..7bdc5cc0 100644 --- a/resources/assets/js/store/mutations.js +++ b/resources/assets/js/store/mutations.js @@ -109,6 +109,31 @@ export default { * @param state * @param project_id */ + getProjectOne(state, project_id) { + if (state.method.runNum(project_id) === 0) { + return; + } + $A.apiAjax({ + url: 'project/one', + data: { + project_id: project_id, + }, + success: ({ret, data, msg}) => { + if (ret === 1) { + let index = state.projectList.findIndex(({id}) => id === data.id); + if (index > -1) { + state.projectList.splice(index, 1, data); + } + } + } + }); + }, + + /** + * 获取项目详情 + * @param state + * @param project_id + */ getProjectDetail(state, project_id) { if (state.method.runNum(project_id) === 0) { return; @@ -135,11 +160,19 @@ export default { }, success: ({ret, data, msg}) => { if (ret === 1) { - state.cacheProject[project_id] = data; - if (state.projectDetail.id === project_id) { + state.cacheProject[data.id] = data; + if (state.projectDetail.id === data.id) { state.projectDetail = data; } state.method.setStorage("cacheProject", state.cacheProject); + // + let index = state.projectList.findIndex(({id}) => id === data.id); + if (index > -1) { + const project = $A.cloneJSON(data); + delete project.project_column; + delete project.project_user; + state.projectList.splice(index, 1, project); + } } else { $A.modalError(msg); } diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index d070d789..3ab4dc0f 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -109,40 +109,91 @@ > ul { width: 100%; > li { - position: relative; - list-style: none; - padding: 0 8px 0 30px; - margin: 4px auto; - border-radius: 4px; display: flex; - align-items: center; - justify-content: space-between; - &:before { - content: ""; - position: absolute; - top: 50%; - left: 8px; - transform: translateY(-50%); - width: 12px; - height: 12px; - background: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIyMzkwODExNTQxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0OTk3IiB3aWR0aD0iNDgiIGhlaWdodD0iNDgiPjxwYXRoIGQ9Ik0zNjYuMTgyNCAxMDguMjM2OEw4MTIuMDMyIDQyOC4wMzJhMTAyLjQgMTAyLjQgMCAwIDEgMCAxNjYuNTAyNEwzNjYuMTgyNCA5MTQuMzI5NmExMDIuNCAxMDIuNCAwIDAgMS0xNjIuMDk5Mi04My4yNTEyVjE5MS40ODhhMTAyLjQgMTAyLjQgMCAwIDEgMTYyLjA5OTItODMuMjUxMnoiIHAtaWQ9IjI0OTk4IiBmaWxsPSIjOTk5OTk5Ij48L3BhdGg+PC9zdmc+") no-repeat center center; - background-size: contain; + flex-direction: column; + margin: 4px auto; + list-style: none; + .project-h1 { + position: relative; + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 8px 0 30px; + border-radius: 4px; + > em { + position: absolute; + top: 50%; + left: 2px; + width: 24px; + height: 24px; + cursor: pointer; + transform: translateY(-50%); + display: flex; + align-items: center; + justify-content: center; + &:before { + content: ""; + width: 12px; + height: 12px; + background: url("data:image/svg+xml;base64,PHN2ZyB0PSIxNjIyMzkwODExNTQxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0OTk3IiB3aWR0aD0iNDgiIGhlaWdodD0iNDgiPjxwYXRoIGQ9Ik0zNjYuMTgyNCAxMDguMjM2OEw4MTIuMDMyIDQyOC4wMzJhMTAyLjQgMTAyLjQgMCAwIDEgMCAxNjYuNTAyNEwzNjYuMTgyNCA5MTQuMzI5NmExMDIuNCAxMDIuNCAwIDAgMS0xNjIuMDk5Mi04My4yNTEyVjE5MS40ODhhMTAyLjQgMTAyLjQgMCAwIDEgMTYyLjA5OTItODMuMjUxMnoiIHAtaWQ9IjI0OTk4IiBmaWxsPSIjOTk5OTk5Ij48L3BhdGg+PC9zdmc+") no-repeat center center; + background-size: contain; + transition: transform 0.2s; + } + } + .title { + flex: 1; + color: #333333; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 38px; + line-height: 38px; + } + .num { + font-size: 12px; + padding-left: 16px; + } } - .title { - flex: 1; - color: #333333; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - height: 38px; - line-height: 38px; - } - .num { - font-size: 12px; - padding-left: 16px; + .project-h2 { + display: none; + margin: 16px 4px; + padding: 0 8px 0 26px; + > p { + display: flex; + align-items: center; + padding: 4px 0; + height: 36px; + em, + span { + font-style: normal; + font-size: 12px; + flex-shrink: 0; + padding-right: 6px; + } + .ivu-progress { + margin-right: -26px; + .ivu-progress-inner { + background-color: #e4e4e4; + } + } + } } &.active { - background-color: #ffffff; + .project-h1 { + background-color: #ffffff; + } + } + &.open-menu { + .project-h1 { + > em { + &:before { + transform: rotate(90deg); + } + } + } + .project-h2 { + display: block; + } } } }