From b2c6fa2d4782bc2a403881b5d847b95e08a9954a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu29@asiainfo.com>
Date: Wed, 18 Sep 2019 21:15:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BB=A5=E7=A1=AE=E4=BF=9D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=83=BD=E5=90=AF=E5=8A=A8=E5=B9=B6=E7=A8=8D=E5=BE=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=BA=86=E9=A1=B5=E9=9D=A2=E5=85=AC=E5=85=B1=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E6=8F=90=E9=AB=98=E8=BF=98=E5=8E=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  4 ++--
 src/components/menu/SiderMenu.vue  |  5 ++++-
 src/components/menu/menu.js        |  2 +-
 src/components/page/PageHeader.vue |  4 ++--
 src/pages/dashboard/WorkPlace.vue  | 11 +++--------
 src/router/index.js                |  2 +-
 src/router/lazy.js                 |  2 +-
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 579d3ae..2a9b024 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "mockjs": "^1.0.1-beta3",
     "pouchdb": "^7.0.0",
     "viser-vue": "^2.2.5",
-    "vue": "^2.5.17",
+    "vue": "^2.6.10",
     "vue-router": "^3.0.1",
     "vuedraggable": "^2.16.0",
     "vuex": "^3.0.1"
@@ -82,7 +82,7 @@
     "vue-jest": "^1.0.2",
     "vue-loader": "^13.3.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "2.5.17",
+    "vue-template-compiler": "^2.6.10",
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
diff --git a/src/components/menu/SiderMenu.vue b/src/components/menu/SiderMenu.vue
index 4c641d1..053eebf 100644
--- a/src/components/menu/SiderMenu.vue
+++ b/src/components/menu/SiderMenu.vue
@@ -6,7 +6,7 @@
         <h1>{{systemName}}</h1>
       </router-link>
     </div>
-    <i-menu :theme="theme" :collapsed="collapsed" :menuData="menuData" @select="onSelect"/>
+    <i-menu :theme="theme" :collapsed="collapsed" :menuData="menuData" @select="onSelect" class="menu"/>
   </a-layout-sider>
 </template>
 
@@ -102,4 +102,7 @@ export default {
       }
     }
   }
+  .menu{
+    padding: 16px 0;
+  }
 </style>
diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js
index fe8ce11..31c0e92 100644
--- a/src/components/menu/menu.js
+++ b/src/components/menu/menu.js
@@ -19,7 +19,7 @@
  * ]
  **/
 import Menu from 'ant-design-vue/es/menu'
-import Icon from 'ant-design-vue/es/icon/icon'
+import Icon from 'ant-design-vue/es/icon/'
 
 const {Item, SubMenu} = Menu
 
diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue
index b071c2c..d583778 100644
--- a/src/components/page/PageHeader.vue
+++ b/src/components/page/PageHeader.vue
@@ -59,7 +59,7 @@ export default {
 <style lang="less" scoped>
   .page-header{
     background: #fff;
-    padding: 16px 32px 0;
+    padding: 16px 24px;
     border-bottom: 1px solid #e8e8e8;
     .page-header-wide{
       &.head{
@@ -69,7 +69,7 @@ export default {
       &.side{
       }
       .breadcrumb{
-        margin-bottom: 16px;
+        margin-bottom: 20px;
       }
       .detail{
         display: flex;
diff --git a/src/pages/dashboard/WorkPlace.vue b/src/pages/dashboard/WorkPlace.vue
index f91ceed..7364591 100644
--- a/src/pages/dashboard/WorkPlace.vue
+++ b/src/pages/dashboard/WorkPlace.vue
@@ -5,17 +5,9 @@
       <div>{{currUser.position}}</div>
     </div>
     <div slot="extra">
-      <a-row>
-        <a-col :sm="7" :xs="24">
           <head-info title="项目数" content="56" :bordered="true"/>
-        </a-col>
-        <a-col :sm="9" :xs="24">
           <head-info title="团队内排名" content="8/24" :bordered="true"/>
-        </a-col>
-        <a-col :sm="8" :xs="24">
           <head-info title="项目访问" content="2,223"/>
-        </a-col>
-      </a-row>
     </div>
     <div>
       <a-row style="margin: 0 -12px">
@@ -222,4 +214,7 @@ export default {
       }
     }
   }
+  .head-info{
+    display: inline-block;
+  }
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index aa1d2d6..9570f6a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,7 +46,7 @@ export default new Router({
       children: [
         {
           path: '/dashboard',
-          name: 'dashboard',
+          name: 'Dashboard',
           component: RouteView,
           icon: 'dashboard',
           children: [
diff --git a/src/router/lazy.js b/src/router/lazy.js
index 7519736..7ddc005 100644
--- a/src/router/lazy.js
+++ b/src/router/lazy.js
@@ -25,7 +25,7 @@ export default new Router({
       children: [
         {
           path: '/dashboard',
-          name: 'dashboard',
+          name: 'Dashboard',
           component: RouteView,
           icon: 'dashboard',
           children: [