From bcb29fa99fb6bdf4ab436a617a711e59f27d4b26 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Fri, 21 Feb 2020 09:08:30 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=87=83=E5=B0=BD?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/project.js                   |  3 ++
 src/views/project/space/overview.vue | 48 ++++++++++++++++++----------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/api/project.js b/src/api/project.js
index de5313a..78c89aa 100644
--- a/src/api/project.js
+++ b/src/api/project.js
@@ -42,3 +42,6 @@ export function analysis(data) {
 export function _projectStats(data) {
     return $http.post('project/project/_projectStats', data);
 }
+export function _getProjectReport(data) {
+    return $http.post('project/project/_getProjectReport', data);
+}
diff --git a/src/views/project/space/overview.vue b/src/views/project/space/overview.vue
index 9e1a860..2342426 100644
--- a/src/views/project/space/overview.vue
+++ b/src/views/project/space/overview.vue
@@ -43,8 +43,10 @@
         <wrapper-content :showHeader="false">
             <div class="overview-item m-b">
                 <div class="content-item">
-                    <h3 class="m-sm m-b text-center">任务燃尽图*</h3>
+                    <h3 class="m-sm m-b text-center">任务燃尽图</h3>
+                    <a-spin :spinning="burnoutMap.loading">
                     <ve-line
+                            v-if="!burnoutMap.loading"
                             :data="burnoutMap.chartData"
                             :settings="burnoutMap.chartSettings"
                             :extend="burnoutMap.chartExtend"
@@ -52,6 +54,7 @@
                             :legend-visible="false"
                             height="200px"
                     ></ve-line>
+                    </a-spin>
                 </div>
             </div>
             <div class="overview-item">
@@ -110,7 +113,8 @@
                                                 <span>{{ item.name }}</span>
                                             </div>
                                             <div slot="description">
-                                                {{item.owner_name}} 创建于 {{moment(item.create_time).format('YYYY年MM月DD日')}}
+                                                {{item.owner_name}} 创建于
+                                                {{moment(item.create_time).format('YYYY年MM月DD日')}}
                                             </div>
                                         </a-list-item-meta>
                                     </a-list-item>
@@ -137,7 +141,8 @@
                                     <div class="stats-number">{{stats.number}}</div>
                                     <a-tooltip placement="right" :mouseEnterDelay="0.3"
                                                :title="`${stats.schedule}%`">
-                                        <a-progress strokeColor="#1890ff" :strokeWidth="3" :showInfo="false" :percent="stats.schedule" />
+                                        <a-progress strokeColor="#1890ff" :strokeWidth="3" :showInfo="false"
+                                                    :percent="stats.schedule"/>
                                     </a-tooltip>
                                 </div>
                             </div>
@@ -164,7 +169,7 @@
 <script>
     import moment from "moment";
     import VeLine from 'v-charts/lib/line.common'
-    import {_projectStats, doData, read as getProject} from "../../../api/project";
+    import {_getProjectReport, _projectStats, doData, read as getProject} from "../../../api/project";
     import {collect} from "../../../api/projectCollect";
     import {checkResponse} from "../../../assets/js/utils";
     import {getLogBySelfProject, dateTotalForProject} from "../../../api/task";
@@ -190,16 +195,10 @@
                 showLoadingMore: false,
                 loadingMore: false,
                 burnoutMap: {
+                    loading: true,
                     chartData: {
                         columns: ['日期', '剩余任务', '基线'],
-                        rows: [
-                            {'日期': '07-09'},
-                            {'日期': '07-10'},
-                            {'日期': '07-11'},
-                            {'日期': '07-12'},
-                            {'日期': '07-13'},
-                            {'日期': '07-14'}
-                        ]
+                        rows: []
                     },
                     series: [
                         {
@@ -207,7 +206,7 @@
                             name: '剩余任务',
                             smooth: false,
                             color: '#1890ff',
-                            data: [10, 9, 1, 7, 2, 3],
+                            data: [],
                         },
                         {
                             type: 'line',
@@ -217,7 +216,7 @@
                             lineStyle: {
                                 type: 'dashed'
                             },
-                            data: [10, 8, 6, 4, 2, 0]
+                            data: []
                         },
                     ],
                     chartSettings: {},
@@ -262,7 +261,7 @@
                 },
                 chartData: {
                     columns: ['日期', '任务'],
-                    rows: []
+                    rows: [],
                 },
                 chartSettings: {
                     area: true,
@@ -351,6 +350,7 @@
                 this.getProjectLog();
                 this.overviewForProject();
                 this.getProjectStats();
+                this.getProjectReport();
             },
             getProject() {
                 this.loading = true;
@@ -362,6 +362,20 @@
                     }
                 });
             },
+            getProjectReport() {
+                let app = this;
+                _getProjectReport({projectCode: this.code}).then(res => {
+                    let rows = [];
+                    res.data.date.forEach((v) => {
+                        rows.push({'日期': v})
+                    });
+                    app.burnoutMap.loading = false;
+                    app.burnoutMap.chartData.rows = rows;
+                    app.burnoutMap.series[0].data = res.data.undoneTask;
+                    app.burnoutMap.series[1].data = res.data.baseLineList;
+
+                });
+            },
             getProjectLog(reset = true) {
                 let app = this;
                 if (reset) {
@@ -396,10 +410,10 @@
             getProjectStats() {
                 _projectStats({
                     projectCode: this.code
-                }).then(res=>{
+                }).then(res => {
                     const taskStats = res.data;
                     const total = taskStats['total'];
-                    this.projectStats.forEach((v,k)=>{
+                    this.projectStats.forEach((v, k) => {
                         v.number = taskStats[v.key];
                         if (total) {
                             v.schedule = parseInt(v.number / total * 100);

From 8bc8da07494adf9ac338e23d6830fe97a304b513 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Fri, 21 Feb 2020 09:11:29 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=87=B32.8.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/version.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/version.js b/src/config/version.js
index ae09240..bcb8cd9 100644
--- a/src/config/version.js
+++ b/src/config/version.js
@@ -1,3 +1,3 @@
 export default {
-    VERSION: '2.8.6',
+    VERSION: '2.8.7',
 };

From d664fb2ef5780ab900dbf0e67517988bfcac2298 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 17:52:26 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E9=82=80=E8=AF=B7=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E6=97=B6=E5=8F=AF=E7=9B=B4=E6=8E=A5=E4=BB=8E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E9=80=89=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/projectMember.js                      |  3 +
 .../project/inviteProjectMember.vue           | 56 ++++++++++++-------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/api/projectMember.js b/src/api/projectMember.js
index 743483f..7f2c17e 100644
--- a/src/api/projectMember.js
+++ b/src/api/projectMember.js
@@ -16,3 +16,6 @@ export function removeMember(memberCode, code) {
 export function list(data) {
     return $http.post('project/project_member/index', data);
 }
+export function _listForInvite(data) {
+    return $http.post('project/project_member/_listForInvite', data);
+}
diff --git a/src/components/project/inviteProjectMember.vue b/src/components/project/inviteProjectMember.vue
index 9ddee45..60cee10 100644
--- a/src/components/project/inviteProjectMember.vue
+++ b/src/components/project/inviteProjectMember.vue
@@ -12,20 +12,21 @@
                 <span>账号邀请</span>
                 <a @click="createInviteLink">通过链接邀请</a>
             </div>
-            <div class="search-content">
+            <div class="search-content m-b">
                 <a-input v-model="keyword" placeholder="输入昵称或邮箱查找">
                     <a-icon slot="prefix" type="search"/>
                 </a-input>
             </div>
-            <div class="member-list">
-                <a-list
-                        class="project-list"
-                        itemLayout="horizontal"
-                        :loading="searching"
-                        :dataSource="list"
-                        :locale="{emptyText: (keyword && keyword.length > 1) ? '没有搜索到相关成员' : ''}"
-                >
-                    <a-list-item slot="renderItem" slot-scope="item">
+            <vue-scroll>
+                <div class="member-list">
+                    <a-list
+                            class="project-list"
+                            itemLayout="horizontal"
+                            :loading="searching"
+                            :dataSource="list"
+                            :locale="{emptyText: (keyword && keyword.length > 1) ? '没有搜索到相关成员' : ''}"
+                    >
+                        <a-list-item slot="renderItem" slot-scope="item">
                     <span slot="actions">
                         <a-button size="small" type="dashed" icon="user-add"
                                   v-if="!item.joined"
@@ -36,15 +37,16 @@
                             <span> 已加入</span>
                         </template>
                      </span>
-                        <a-list-item-meta
-                                :description="item.email"
-                        >
-                            <span slot="title">{{item.name}}</span>
-                            <a-avatar slot="avatar" icon="user" :src="item.avatar"/>
-                        </a-list-item-meta>
-                    </a-list-item>
-                </a-list>
-            </div>
+                            <a-list-item-meta
+                                    :description="item.email"
+                            >
+                                <span slot="title">{{item.name}}</span>
+                                <a-avatar slot="avatar" icon="user" :src="item.avatar"/>
+                            </a-list-item-meta>
+                        </a-list-item>
+                    </a-list>
+                </div>
+            </vue-scroll>
         </a-modal>
         <a-modal
                 class="invite-link"
@@ -70,7 +72,7 @@
 <script>
     import _ from 'lodash'
     import moment from 'moment';
-    import {inviteMember, searchInviteMember} from "../../api/projectMember";
+    import {inviteMember, searchInviteMember, _listForInvite} from "../../api/projectMember";
     import {checkResponse} from "../../assets/js/utils";
     import {createInviteLink} from "../../api/common/common";
 
@@ -119,7 +121,16 @@
                 this.search();
             }
         },
+        created() {
+            this.getMembers();
+        },
         methods: {
+            getMembers() {
+                let app = this;
+                _listForInvite({projectCode: app.projectCode}).then(res=>{
+                    app.list = res.data;
+                });
+            },
             invite(item) {
                 inviteMember(item.memberCode, this.projectCode).then((res) => {
                     const success = checkResponse(res);
@@ -148,6 +159,7 @@
                         this.list = [];
                     }
                     if (this.keyword.length <= 1) {
+                        this.getMembers();
                         return false;
                     }
                     this.searching = true;
@@ -169,6 +181,7 @@
     .invite-project-member {
         .ant-modal-body {
             padding-top: 0;
+            padding-right: 12px;
             padding-bottom: 24px;
             min-height: 40vh;
         }
@@ -181,7 +194,8 @@
         }
 
         .member-list {
-            padding-top: 12px;
+            padding-right: 12px;
+            max-height: 400px;
         }
 
     }

From 0f5d81ee66b488cd16551986af1a02127ca26949 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 17:58:20 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E6=A0=87=E7=AD=BE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/space/features.vue | 8 ++++----
 src/views/project/space/files.vue    | 8 ++++----
 src/views/project/space/overview.vue | 8 ++++----
 src/views/project/space/task.vue     | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/project/space/features.vue b/src/views/project/space/features.vue
index a3937f2..f41a241 100644
--- a/src/views/project/space/features.vue
+++ b/src/views/project/space/features.vue
@@ -25,16 +25,16 @@
             <section class="nav-body">
                 <ul class="nav-wrapper nav nav-underscore pull-left">
                     <li><a class="app" data-app="tasks"
-                           @click="$router.push('/project/space/task/' + project.code)">任务</a></li>
+                           @click="$router.push('/project/space/task/' + code)">任务</a></li>
                     <li class=""><a class="app" data-app="works"
-                                    @click="$router.push('/project/space/files/' + project.code)">
+                                    @click="$router.push('/project/space/files/' + code)">
                         文件</a>
                     <li><a class="app" data-app="build"
-                           @click="$router.push('/project/space/overview/' + project.code)">
+                           @click="$router.push('/project/space/overview/' + code)">
                         概览</a>
                     </li>
                     <li class="actives"><a class="app" data-app="build"
-                                           @click="$router.push('/project/space/features/' + project.code)">
+                                           @click="$router.push('/project/space/features/' + code)">
                         版本</a>
                     </li>
                 </ul>
diff --git a/src/views/project/space/files.vue b/src/views/project/space/files.vue
index f16795b..ab85d6a 100644
--- a/src/views/project/space/files.vue
+++ b/src/views/project/space/files.vue
@@ -25,16 +25,16 @@
             <section class="nav-body">
                 <ul class="nav-wrapper nav nav-underscore pull-left">
                     <li><a class="app" data-app="tasks"
-                           @click="$router.push('/project/space/task/' + project.code)">任务</a></li>
+                           @click="$router.push('/project/space/task/' + code)">任务</a></li>
                     <li class="actives"><a class="app" data-app="works"
-                                           @click="$router.push('/project/space/files/' + project.code)">
+                                           @click="$router.push('/project/space/files/' + code)">
                         文件</a>
                     <li><a class="app" data-app="build"
-                           @click="$router.push('/project/space/overview/' + project.code)">
+                           @click="$router.push('/project/space/overview/' + code)">
                         概览</a>
                     </li>
                     <li class=""><a class="app" data-app="build"
-                                    @click="$router.push('/project/space/features/' + project.code)">
+                                    @click="$router.push('/project/space/features/' + code)">
                         版本</a>
                     </li>
                 </ul>
diff --git a/src/views/project/space/overview.vue b/src/views/project/space/overview.vue
index 2342426..9e1ac2b 100644
--- a/src/views/project/space/overview.vue
+++ b/src/views/project/space/overview.vue
@@ -25,16 +25,16 @@
             <section class="nav-body">
                 <ul class="nav-wrapper nav nav-underscore pull-left">
                     <li><a class="app" data-app="tasks"
-                           @click="$router.push('/project/space/task/' + project.code)">任务</a></li>
+                           @click="$router.push('/project/space/task/' + code)">任务</a></li>
                     <li class=""><a class="app" data-app="works"
-                                    @click="$router.push('/project/space/files/' + project.code)">
+                                    @click="$router.push('/project/space/files/' + code)">
                         文件</a>
                     <li class="actives"><a class="app" data-app="build"
-                                           @click="$router.push('/project/space/overview/' + project.code)">
+                                           @click="$router.push('/project/space/overview/' + code)">
                         概览</a>
                     </li>
                     <li class=""><a class="app" data-app="build"
-                                    @click="$router.push('/project/space/features/' + project.code)">
+                                    @click="$router.push('/project/space/features/' + code)">
                         版本</a>
                     </li>
                 </ul>
diff --git a/src/views/project/space/task.vue b/src/views/project/space/task.vue
index 72572a8..957ecd6 100644
--- a/src/views/project/space/task.vue
+++ b/src/views/project/space/task.vue
@@ -26,14 +26,14 @@
                 <ul class="nav-wrapper nav nav-underscore pull-left">
                     <li class="actives"><a class="app" data-app="tasks">任务</a></li>
                     <li class=""><a class="app" data-app="works"
-                                    @click="$router.push('/project/space/files/' + project.code)">
+                                    @click="$router.push('/project/space/files/' + code)">
                         文件</a>
                     <li class=""><a class="app" data-app="build"
-                                    @click="$router.push('/project/space/overview/' + project.code)">
+                                    @click="$router.push('/project/space/overview/' + code)">
                         概览</a>
                     </li>
                     <li class=""><a class="app" data-app="build"
-                                    @click="$router.push('/project/space/features/' + project.code)">
+                                    @click="$router.push('/project/space/features/' + code)">
                         版本</a>
                     </li>
                 </ul>

From 3279200d4a0c317170b8951850cd6cfb69d20647 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 18:03:42 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/projectConfig.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/project/projectConfig.vue b/src/components/project/projectConfig.vue
index e097c03..3418d0f 100644
--- a/src/components/project/projectConfig.vue
+++ b/src/components/project/projectConfig.vue
@@ -471,6 +471,7 @@
                     this.project.open_prefix = !!res.data.open_prefix;
                     this.project.open_begin_time = !!res.data.open_begin_time;
                     this.project.open_task_private = !!res.data.open_task_private;
+                    this.project.auto_update_schedule = !!res.data.auto_update_schedule;
                 });
             },
             getTaskWorkflowList() {

From 13d057fa7cf860c2162d75cb4fa80a1224f6d43b Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 18:38:10 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=9B=A2=E9=98=9F?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js               |  3 +++
 src/views/members/profile.vue | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 075ccf2..08e0cbd 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -60,6 +60,9 @@ export function read(code) {
     return $http.post('project/account/read', {code: code});
 }
 
+export function syncDetail(data) {
+    return $http.post('project/account/_syncDetail', data);
+}
 export function editAccount(data) {
     return $http.post('project/account/edit', data);
 }
diff --git a/src/views/members/profile.vue b/src/views/members/profile.vue
index 74b9c9f..89ed816 100644
--- a/src/views/members/profile.vue
+++ b/src/views/members/profile.vue
@@ -27,6 +27,14 @@
                     <div class="mail muted">
                         <a-icon type="mail"></a-icon>
                         {{member.email}}
+                        <a-tooltip>
+                            <template slot="title">
+                                <span>更新基础资料</span>
+                            </template>
+                            <a class="muted m-l-sm" @click="syncDetail">
+                                <a-icon type="reload"/>
+                            </a>
+                        </a-tooltip>
                     </div>
                 </template>
             </div>
@@ -148,7 +156,7 @@
                                 </div>
                                 <div slot="description">
                                     <span class="m-l-sm">{{item.description}}</span>
-<!--                                    <a-progress :strokeWidth="5" :percent="item.schedule"/>-->
+                                    <!--                                    <a-progress :strokeWidth="5" :percent="item.schedule"/>-->
                                 </div>
                             </a-list-item-meta>
                         </a-list-item>
@@ -249,7 +257,7 @@
     import taskDetail from '@/components/project/taskDetail'
     import pagination from "../../mixins/pagination";
     import {checkResponse} from "../../assets/js/utils";
-    import {editAccount, read} from "../../api/user";
+    import {editAccount, read, syncDetail} from "../../api/user";
     import {selfList} from "../../api/task";
     import {selfList as getProjectList} from "../../api/project";
     import {formatTaskTime} from "../../assets/js/dateTime";
@@ -314,6 +322,11 @@
                     this.member = res.data;
                 });
             },
+            syncDetail() {
+                syncDetail({code: this.code}).then(res => {
+                    this.getMember();
+                });
+            },
             getTasks() {
                 this.task.loading = true;
                 selfList({

From f18c98cb0d2fcae8ac6bb7a45080af5d542d70c0 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 20:23:36 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/projectInfo.js               |  17 +++
 src/views/project/space/overview.vue | 197 +++++++++++++++++++++++++--
 2 files changed, 205 insertions(+), 9 deletions(-)
 create mode 100644 src/api/projectInfo.js

diff --git a/src/api/projectInfo.js b/src/api/projectInfo.js
new file mode 100644
index 0000000..9fdb87a
--- /dev/null
+++ b/src/api/projectInfo.js
@@ -0,0 +1,17 @@
+import $http from '@/assets/js/http'
+
+export function list(data) {
+    return $http.post('project/project_info', data);
+}
+
+export function doData(data) {
+    let url = 'project/project_info/save';
+    if (data.infoCode) {
+        url = 'project/project_info/edit';
+    }
+    return $http.post(url, data);
+}
+
+export function del(data) {
+    return $http.post('project/project_info/delete', data);
+}
diff --git a/src/views/project/space/overview.vue b/src/views/project/space/overview.vue
index 9e1ac2b..9a4edbc 100644
--- a/src/views/project/space/overview.vue
+++ b/src/views/project/space/overview.vue
@@ -45,20 +45,64 @@
                 <div class="content-item">
                     <h3 class="m-sm m-b text-center">任务燃尽图</h3>
                     <a-spin :spinning="burnoutMap.loading">
-                    <ve-line
-                            v-if="!burnoutMap.loading"
-                            :data="burnoutMap.chartData"
-                            :settings="burnoutMap.chartSettings"
-                            :extend="burnoutMap.chartExtend"
-                            :series="burnoutMap.series"
-                            :legend-visible="false"
-                            height="200px"
-                    ></ve-line>
+                        <ve-line
+                                v-if="!burnoutMap.loading"
+                                :data="burnoutMap.chartData"
+                                :settings="burnoutMap.chartSettings"
+                                :extend="burnoutMap.chartExtend"
+                                :series="burnoutMap.series"
+                                :legend-visible="false"
+                                height="200px"
+                        ></ve-line>
                     </a-spin>
                 </div>
             </div>
             <div class="overview-item">
                 <div class="content-left">
+                    <div class="content-item log-list">
+                        <div class="title">
+                            项目信息
+                            <a-tooltip :mouseEnterDelay="0.5">
+                                <template slot="title">
+                                    <span>添加信息</span>
+                                </template>
+                                <a class="pull-right muted" @click="createInfo()">
+                                    <a-icon type="plus-circle"/>
+                                </a>
+                            </a-tooltip>
+                        </div>
+                        <div class="list-content">
+                            <a-list>
+                                <a-list-item :key="index" v-for="(item, index) in projectInfoList">
+                                    <a-list-item-meta>
+                                        <div slot="title">
+                                            <a-tooltip :mouseEnterDelay="0.5">
+                                                <template slot="title">
+                                                    <span>{{item.description ? item.description : '暂无描述'}}</span>
+                                                </template>
+                                                <span>{{ item.name }} </span>
+                                            </a-tooltip>
+<!--                                            <span class="right-item muted"> {{ formatTime(item.create_time) }}-->
+<!--                                        </span>-->
+                                        </div>
+                                        <div slot="description">
+                                            {{ item.value }}
+                                        </div>
+                                    </a-list-item-meta>
+                                    <span slot="actions" @click="editInfo(item)">
+                                         <a-tooltip title="编辑">
+                                             <a-icon type="edit"/>
+                                         </a-tooltip>
+                                    </span>
+                                    <span slot="actions" @click="delInfo(item,index)">
+                                         <a-tooltip title="删除">
+                                              <a-icon type="delete"/>
+                                         </a-tooltip>
+                                    </span>
+                                </a-list-item>
+                            </a-list>
+                        </div>
+                    </div>
                     <div class="content-item log-list">
                         <div class="title">
                             项目动态
@@ -163,6 +207,46 @@
                 </div>
             </div>
         </wrapper-content>
+        <!--项目信息-->
+        <a-modal
+                class="project-info"
+                :width="400"
+                v-model="infoModal.modalStatus"
+                :title="infoModal.modalTitle"
+                :confirmLoading="infoModal.loading"
+                @ok="handleSubmit"
+        >
+            <a-form
+                    @submit.prevent="handleSubmit"
+                    :form="infoModal.form"
+            >
+                <a-form-item
+                >
+                    <a-input placeholder='名称'
+                             v-decorator="[
+                                            'name',
+                                            {rules: [{ required: true, message: '请输入名称' }]}
+                                            ]"/>
+                </a-form-item>
+                <a-form-item
+                >
+                    <a-textarea placeholder='内容'
+                                :rows="2"
+                                v-decorator="['value']"
+                    />
+                </a-form-item>
+                <a-form-item
+                >
+                    <a-textarea placeholder='描述'
+                                :rows="2"
+                                v-decorator="['description']"
+                    />
+                </a-form-item>
+                <a-form-item
+                >
+                </a-form-item>
+            </a-form>
+        </a-modal>
     </div>
 </template>
 
@@ -170,6 +254,7 @@
     import moment from "moment";
     import VeLine from 'v-charts/lib/line.common'
     import {_getProjectReport, _projectStats, doData, read as getProject} from "../../../api/project";
+    import {doData as doInfo, list as getInfoList, del as delProjectInfo} from "../../../api/projectInfo";
     import {collect} from "../../../api/projectCollect";
     import {checkResponse} from "../../../assets/js/utils";
     import {getLogBySelfProject, dateTotalForProject} from "../../../api/task";
@@ -192,8 +277,18 @@
                 project: {task_board_theme: 'simple'},
                 projectDate: [],
                 activities: [],
+                projectInfoList: [],
                 showLoadingMore: false,
                 loadingMore: false,
+                infoModal: {
+                    form: this.$form.createForm(this),
+                    newData: {
+                        code: ''
+                    },
+                    loading: false,
+                    modalStatus: false,
+                    modalTitle: '项目信息',
+                },
                 burnoutMap: {
                     loading: true,
                     chartData: {
@@ -347,6 +442,7 @@
         methods: {
             moment,
             init() {
+                this.getProjectInfoList();
                 this.getProjectLog();
                 this.overviewForProject();
                 this.getProjectStats();
@@ -407,6 +503,12 @@
                     app.loadingMore = false;
                 })
             },
+            getProjectInfoList() {
+                let app = this;
+                getInfoList({projectCode: app.code}).then(res => {
+                    app.projectInfoList = res.data;
+                });
+            },
             getProjectStats() {
                 _projectStats({
                     projectCode: this.code
@@ -438,6 +540,77 @@
                     this.chartData.rows = list;
                 })
             },
+            createInfo() {
+                let app = this;
+                app.infoModal.newData = {code: ''};
+                setTimeout(function () {
+                    app.infoModal.form && app.infoModal.form.resetFields();
+                }, 0);
+                app.infoModal.modalStatus = true;
+                app.infoModal.modalTitle = '添加字段';
+            },
+            editInfo(info) {
+                let app = this;
+                app.infoModal.newData = info;
+                app.infoModal.modalStatus = true;
+                setTimeout(function () {
+                    app.infoModal.modalTitle = '编辑字段';
+                    app.infoModal.form.setFieldsValue({
+                        name: info.name,
+                        value: info.value,
+                        description: info.description,
+                    });
+                }, 0);
+            },
+            delInfo(info, index) {
+                let app = this;
+                app.$confirm({
+                    title: '确定删除当前字段吗？',
+                    okText: '删除',
+                    okType: 'danger',
+                    cancelText: '再想想',
+                    onOk() {
+                        delProjectInfo({infoCode: info.code}).then(() => {
+                            app.projectInfoList.splice(index, 1);
+                            // app.init();
+                        });
+                        return Promise.resolve();
+                    }
+                });
+            },
+            handleSubmit() {
+                let app = this;
+                app.infoModal.form.validateFields(
+                    (err) => {
+                        if (!err) {
+                            app.handleOk();
+                        }
+                    })
+            },
+            handleOk() {
+                let app = this;
+                app.infoModal.loading = true;
+                let obj = app.infoModal.form.getFieldsValue();
+                if (app.infoModal.newData.code) {
+                    //编辑
+                    obj.infoCode = app.infoModal.newData.code;
+                } else {
+                    //新增
+                    Object.assign(obj, app.infoModal.newData);
+                }
+                obj.projectCode = app.code;
+                console.log(obj);
+                doInfo(obj).then(res => {
+                    app.infoModal.loading = false;
+                    if (!checkResponse(res)) {
+                        return;
+                    }
+                    app.infoModal.form.resetFields();
+                    app.infoModal.newData = {code: 0};
+                    app.infoModal.modalStatus = false;
+                    app.getProjectInfoList();
+                });
+            },
             collectProject() {
                 const type = this.project.collected ? 'cancel' : 'collect';
                 collect(this.project.code, type).then((res) => {
@@ -465,6 +638,11 @@
 
 <style lang="less">
     /*@import "../../../assets/css/components/task";*/
+    .project-info {
+        .ant-modal-body {
+            padding-bottom: 0;
+        }
+    }
 
     .project-space-overview {
         .project-navigation {
@@ -506,6 +684,7 @@
 
                 .log-list {
                     background: #fff;
+                    margin-bottom: 15px;
 
                     .list-content {
                         padding-top: 12px;

From 8d0584a92a0c176b2b622dc34101482b3b9c19c0 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 20:23:49 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=87=B32.8.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/version.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/version.js b/src/config/version.js
index bcb8cd9..69438ea 100644
--- a/src/config/version.js
+++ b/src/config/version.js
@@ -1,3 +1,3 @@
 export default {
-    VERSION: '2.8.7',
+    VERSION: '2.8.8',
 };

From e382942155bdf32f97d9fb88e0f35fdf8cf378d0 Mon Sep 17 00:00:00 2001
From: vilson <545522390@qq.com>
Date: Sat, 22 Feb 2020 20:37:11 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            | Bin 4286 -> 4286 bytes
 .../project/inviteProjectMember.vue           |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index 8c33ea1b10394137d8ae80b180f1d55351afb20f..1f81ad607fdafc00ff2c0293902036fba08641cd 100644
GIT binary patch
literal 4286
zcmcgw>rWh26kq=XKl!2in&PXa`a!8$O*DPP#wMEhsnHm%^@AqphbC%N6vV!S*2aRh
zwAGaWKB&;rRuoHG@hwVi>x(MZ!Xm^Vva>t0v#;6V_&d|Nn_+i{9VjW}$DNt`yXTzy
zyZ4-XgU53PekIAne?9G2dOTNoJf0;0K6zFG{N4OPU;fYZ^fb9aB4f~0+@O^1%ul4J
zO-_0ijvHTs^UJtS&mW1?ik(sNRYk}P_+O0Bn#LHN`$sq9KJ&Lu&m4}^tvjM-|00XC
za(9%r_GlEI%DS4L@X2i~Y0#!aaq_(sp+)d#NBLHn21ay}HG?V-#>rcRW9LgXGS&4a
zD3f*8&F*_bF=)-67<sEP-#qwgBGfmOq48*z?t%thyt~Citturlv&X<|d+!0*eHnHw
z-1d5u_I{lt)_F9NB`s~x-A&-sf@9&1hA8d-Hc4m4bQ*@<{UaHwKbfE#>g61Vxs{#q
zS=VCs7YXvd0=pJAb;V78c73*=0B18e7M|<YDCsb-N$l74txAr|V?O#VT{H$YWzf={
zh<6KY1CJe4DQgt!Re^ow#U5Z(V&54h@<&5XtbGf5Sz}i3j};x$^=q1Z+hh}Ebx|6R
z72mhdeyox2RhcTV{{Lcrc5R%V`@_09hQ~2}wsObLuln?&UG9Ih!+D(yXfimVn>k`1
zU+Vcz%-dH7|3K(esvzzS@ae;TVeI%aQP5w?eyRS)kHS9Im$9X<(Eh`nYOa6RH^~L}
zU)dce|1Q}?Z4v)ZLx1k~y(ZI>;Fg-tT>I~NS0z7knb9;*sDIl}sa*fEH=`6oKFrmJ
z6MqObA&45`x9}ZmNj`T1d->`&z(Ia7YCkVrqx>;$-Z?)XIR@?7HgHR`;#iAc_$)#G
zM(}_Dxch!g70p#Qewo8HzY6mRKu>|t*+T7wy-32K6)g(+_aFw0;r0QXe|@N@eEtev
zsg~F7*!eWA>rg4s1m70!Kdd^=UDzC)%+gKo#3;BoIs@BL-vy^syAkJZ0QqjmD%4Y6
z<5FX}{{qgp`wk)YeTdz{A9FazyZ_2i05w-&<8h6qpsgF<g7X7vq=^68kn^4qe0zId
z#(ob$LqGy#+$Ze)Zl1qq|8HXsz;)QOdXclp$<76w9a1xVn@}h+5C0>uA?CpCFxJG$
zU;g*r(F{qg@DG%~5AEg<yRgM)@A7sPb5Kk)6v-Q>v-hd55)^DxC;+VQ)m+Cde2ccG
zKS@#x<^kOJfkLCoMGg3#wBdwierq{5^FGm!v#|_Z3G-&O4bAKqw%xR0_`4o9g3vM8
z7NgZiRSM&N*b~lJ-xOMo92d4uBX@7^f@baT4crdCc8PcK1A}P_zK0krEc;NUb)Up@
z?+-!;75A@d)XHlRi-bIvz$pVx;{GmTn{Uf&Ts?qwu=LDtx1CPWz@$!6C+2KnG1}%o
z=dXKytQ<q=_cSfR9YJU-+IpOur~b>*V$>@}MYl>lW0^~ycYX}~K8E_a`Amu`aF=0?
z8BgG@BI8cJ7VFT682P!_*oFMoF^v4Sv@SoQQe*+|3U1<Le@o$4XnuSF_L&>Mc1{EG
hz6`mx3iTy&88o;17SB`AVLr80jORB0{{ff#{eQ95b}Rq@

literal 4286
zcmdUxT}V_x6vyY@{ct5pF;p;GSLwqKFjPpwm6f1}=rIzB>Zu|ks)y(y30*Ks7sHI6
z0=0;UO4Fjij9M!ak&4{a#1=o0!jDXhC|z|=|FgR{3R}EhZ;)4hJLAlp^FQaz?A{SV
z!k^71_*2}96(T_hkp?g%3IUG?AI!zA3K1GuVV_<SrXCW)OC}H}d1*bcqMrcF=<}TJ
zNrnAJqumNlf(Gyg41giv1&!b+$VLoNy2Rl@E?p$SXCAl#Cc!+Q2=Lrza24c=Uf6eQ
ztB1sP-DHBF!(bRh(u_3Dwb_R{$V;sS?1b<H^FD<Blm=}jrU{P0*ad$}I2WuBwt<g8
z@ujuxhmS0v?p*RZoNuhJ)j?Z{xdJ{VH8tQk!8+j6QJ=pbiD1zh@EWigd;&`R%We5P
zY6UArKMAq+>6rgJ_=;DPfAEZW$$+(2bkuiR__s_&{dt2pPLK<D-<G@gJ@By!EV}o<
z7GSLb@xtZ^m;qX2_zK%%pgMOYhOo^Vv@JlZejRGg?@Gn(l3I=d9M`D-1$Kq(L+it~
zU<()nggk<9Uj?tQW;M_%&)Q5pbUg{ZM5Uud+Xqy~@DO%pt+nT%!}_s!7j`=OiTnYg
z`bi>LUH*;GHtL`s1O1L1AJN1d(T5qL)IL=;XwXUD0zZ$<-9)EHh%QeMt$nXb--$YD
zzW)Rd4eZ$m_JQwpek1D6puZ5$JjMcqdlS#`yNl1Q=Ch|5vJb#_-Fx6q-M8OJ>hhD^
zK16bJ6G@L+NopUQl|8d(gb(*FzANkSgk#|M=S?sZ%<+Yfq;q>os;?ob@eYaF3uL@j
zLDu`#{yg`kQ+rwu%8sYyI;e+Sgky+7TP*cZlcD*+i0PP(Oy#@3TN>(qB;Kv0tQHsL
zKXZ}Y?HUITpqqZsQD`rOATn92b{*JwHg$f3GxK#$%lW2!w~Gn@G!?ER76ZohjRD>=
z%2JtZFrHCro6M~*DzUd!jsB+1F}OiA&|N>hEJdU{Q%umW24k7!={xMtFP?zb6j1Vi
zg1+Tn=yO8QW#U10T1k?*;AM>&T06mQ&;g3}4_64Zy5}Fsp}oz;dQl)Y-(4w#NK5~l
zapGq>naFLxkE)=65T$b=9MeK1{{;u;9lVZVn}tY3WntWC2f;Mf&4mfzf0_bBKLH}&
BeuDr2

diff --git a/src/components/project/inviteProjectMember.vue b/src/components/project/inviteProjectMember.vue
index 60cee10..e6c7097 100644
--- a/src/components/project/inviteProjectMember.vue
+++ b/src/components/project/inviteProjectMember.vue
@@ -2,7 +2,7 @@
     <div>
         <a-modal
                 class="invite-project-member"
-                :width="360"
+                :width="500"
                 v-model="actionInfo.modalStatus"
                 :title="actionInfo.modalTitle"
                 :footer="null"