Merge pull request #60 from ZY2071/master

feat: 修改项目依赖以确保项目能启动并稍微调整了页面公共布局提高还原度

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",

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>

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
 

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;

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>

src/router/index.js

@@ -46,7 +46,7 @@ export default new Router({
       children: [
         {
           path: '/dashboard',
-          name: 'dashboard',
+          name: 'Dashboard',
           component: RouteView,
           icon: 'dashboard',
           children: [

src/router/lazy.js

@@ -25,7 +25,7 @@ export default new Router({
       children: [
         {
           path: '/dashboard',
-          name: 'dashboard',
+          name: 'Dashboard',
           component: RouteView,
           icon: 'dashboard',
           children: [