From 0a490feda399456966ae25b5018bbf87df78a563 Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Sun, 21 Jun 2020 23:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/PageHeader.vue  | 10 +++------
 src/components/setting/Setting.vue  |  2 +-
 src/components/tool/HeadInfo.vue    | 35 ++++++++++-------------------
 src/layouts/HeaderlAvatar.vue       |  2 +-
 src/layouts/PageLayout.vue          |  2 +-
 src/pages/dashboard/WorkPlace.vue   | 10 ++++-----
 src/pages/detail/AdvancedDetail.vue |  6 ++---
 src/pages/list/StandardList.vue     | 16 +++++--------
 src/theme/default/style.less        |  5 +++++
 9 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue
index bb62215..bf4a873 100644
--- a/src/components/page/PageHeader.vue
+++ b/src/components/page/PageHeader.vue
@@ -75,7 +75,6 @@ export default {
         display: flex;
         .row {
           display: flex;
-          width: 100%;
         }
         .avatar {
           flex: 0 1 72px;
@@ -89,7 +88,6 @@ export default {
         }
         .main{
           width: 100%;
-          flex: 0 1 auto;
           .title{
             flex: auto;
             font-size: 20px;
@@ -104,14 +102,12 @@ export default {
             margin-right: 16px;
           }
           .content{
-            /*margin-bottom: 16px;*/
-            flex: auto;
+            flex: 1;
           }
           .extra{
-            flex: 0 1 auto;
+            display: flex;
             margin-left: 88px;
-            min-width: 242px;
-            text-align: right;
+            min-width: 420px;
           }
           .action{
             margin-left: 56px;
diff --git a/src/components/setting/Setting.vue b/src/components/setting/Setting.vue
index 42c78bc..d7e82ce 100644
--- a/src/components/setting/Setting.vue
+++ b/src/components/setting/Setting.vue
@@ -32,7 +32,7 @@
           <a-switch :checked="fixedHeader" slot="actions" size="small" @change="setFixedHeader" />
         </a-list-item>
         <a-list-item>
-          固定Siderbar
+          固定侧边栏
           <a-switch :checked="fixedSider" slot="actions" size="small" @change="setFixedSider" />
         </a-list-item>
       </a-list>
diff --git a/src/components/tool/HeadInfo.vue b/src/components/tool/HeadInfo.vue
index 620397d..6f65ee6 100644
--- a/src/components/tool/HeadInfo.vue
+++ b/src/components/tool/HeadInfo.vue
@@ -2,7 +2,6 @@
   <div class="head-info">
     <span>{{title}}</span>
     <p>{{content}}</p>
-    <em v-if="bordered" />
   </div>
 </template>
 
@@ -15,29 +14,19 @@ export default {
 
 <style lang="less" scoped>
   .head-info{
-    position: relative;
     text-align: center;
     padding: 0 32px;
-  span{
-    color: rgba(0,0,0,.45);
-    display: inline-block;
-    font-size: 14px;
-    line-height: 22px;
-    margin-bottom: 4px;
-  };
-  p{
-    color: rgba(0,0,0,.85);
-    font-size: 24px;
-    line-height: 32px;
-    margin: 0;
-  };
-  em{
-    background-color: #e8e8e8;
-    position: absolute;
-    height: 56px;
-    width: 1px;
-    top: 0;
-    right: 0;
-  }
+    width: 100%;
+    span{
+      color: rgba(0,0,0,.45);
+      display: inline-block;
+      font-size: 14px;
+      margin-bottom: 4px;
+    }
+    p{
+      color: rgba(0,0,0,.85);
+      font-size: 24px;
+      margin: 0;
+    }
   }
 </style>
diff --git a/src/layouts/HeaderlAvatar.vue b/src/layouts/HeaderlAvatar.vue
index de7757a..73f7c87 100644
--- a/src/layouts/HeaderlAvatar.vue
+++ b/src/layouts/HeaderlAvatar.vue
@@ -1,7 +1,7 @@
 <template>
   <a-dropdown>
     <div class="header-avatar" style="cursor: pointer">
-      <a-avatar class="avatar" :size="30" shape="circle" :src="user.avatar"/>
+      <a-avatar class="avatar" size="small" shape="circle" :src="user.avatar"/>
       <span class="name">{{user.name}}</span>
     </div>
     <a-menu :class="['avatar-menu']" slot="overlay">
diff --git a/src/layouts/PageLayout.vue b/src/layouts/PageLayout.vue
index 200b07f..ef09922 100644
--- a/src/layouts/PageLayout.vue
+++ b/src/layouts/PageLayout.vue
@@ -11,7 +11,7 @@
           </template>
         </div>
       </div>
-      <slot v-if="this.$refs.extra" slot="extra" name="extra"></slot>
+      <slot v-if="this.$slots.extra" slot="extra" name="extra"></slot>
     </page-header>
     <div ref="page" :class="['page-content', layout]" >
       <slot></slot>
diff --git a/src/pages/dashboard/WorkPlace.vue b/src/pages/dashboard/WorkPlace.vue
index 56436f8..ee43ba3 100644
--- a/src/pages/dashboard/WorkPlace.vue
+++ b/src/pages/dashboard/WorkPlace.vue
@@ -4,11 +4,11 @@
       <div class="title">{{currUser.timefix}}，{{currUser.name}}，{{currUser.welcome}}</div>
       <div>{{currUser.position}}</div>
     </div>
-    <div slot="extra">
-          <head-info title="项目数" content="56" :bordered="true"/>
-          <head-info title="团队内排名" content="8/24" :bordered="true"/>
-          <head-info title="项目访问" content="2,223"/>
-    </div>
+    <template slot="extra">
+      <head-info class="split-right" title="项目数" content="56"/>
+      <head-info class="split-right" title="团队内排名" content="8/24"/>
+      <head-info class="split-right" title="项目访问" content="2,223"/>
+    </template>
     <div>
       <a-row style="margin: 0 -12px">
         <a-col style="padding: 0 12px" :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
diff --git a/src/pages/detail/AdvancedDetail.vue b/src/pages/detail/AdvancedDetail.vue
index e7a893f..f3c7c24 100644
--- a/src/pages/detail/AdvancedDetail.vue
+++ b/src/pages/detail/AdvancedDetail.vue
@@ -8,7 +8,7 @@
       <detail-list-item term="生效日期">2018-08-07 ~ 2018-12-11</detail-list-item>
       <detail-list-item term="备注">请于两个工作日内确认</detail-list-item>
     </detail-list>
-    <a-row slot="extra">
+    <a-row style="text-align: right;width: 100%;" slot="extra">
       <a-col :xs="24" :sm="12">
         <div class="text">状态</div>
         <div class="heading">待审批</div>
@@ -19,7 +19,7 @@
       </a-col>
     </a-row>
     <template slot="action">
-      <a-button-group style="margin-right: 4px;">
+      <a-button-group style="margin-right: 8px;">
         <a-button>操作</a-button>
         <a-button>操作</a-button>
         <a-button><a-icon type="ellipsis"/></a-button>
@@ -171,7 +171,7 @@ export default {
   }
   .heading{
     color: rgba(0,0,0,.85);
-    font-size: 20px;
+    font-size: 28px;
   }
   .nodata{
     color: rgba(0,0,0,.25);
diff --git a/src/pages/list/StandardList.vue b/src/pages/list/StandardList.vue
index 5f6da54..c44c1ce 100644
--- a/src/pages/list/StandardList.vue
+++ b/src/pages/list/StandardList.vue
@@ -2,13 +2,13 @@
   <div>
     <a-card :bordered="false">
       <a-row>
-        <a-col :sm="8" :xs="24">
+        <a-col :sm="8" :xs="24" class="split-right">
           <head-info title="我的待办" content="8个任务" :bordered="true"/>
         </a-col>
-        <a-col :sm="8" :xs="24">
+        <a-col :sm="8" :xs="24" class="split-right">
           <head-info title="本周任务平均处理时间" content="32分钟" :bordered="true"/>
         </a-col>
-        <a-col :sm="8" :xs="24">
+        <a-col :sm="8" :xs="24" class="split-right">
           <head-info title="本周完成任务数" content="24个"/>
         </a-col>
       </a-row>
@@ -33,7 +33,7 @@
             description="那是一种内在的东西， 他们到达不了，也无法触及的"
           >
             <a-avatar slot="avatar" size="large" shape="square" src="https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png"/>
-            <a slot="title">Alipay</a>
+            <a slot="title">AliPay</a>
           </a-list-item-meta>
           <div slot="actions">
             <a>编辑</a>
@@ -75,11 +75,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .ant-avatar-lg{
-    width: 48px;
-    height: 48px;
-    line-height: 48px;
-  }
   .list-content-item{
     color: rgba(0,0,0,.45);
     display: inline-block;
@@ -90,8 +85,7 @@ export default {
       line-height: 20px;
     }
     p{
-      margin-top: 4px;
-      margin-bottom: 0;
+      margin: 4px 0 0;
       line-height: 22px;
     }
   }
diff --git a/src/theme/default/style.less b/src/theme/default/style.less
index e7e7525..5493797 100644
--- a/src/theme/default/style.less
+++ b/src/theme/default/style.less
@@ -21,3 +21,8 @@
     background: @primary-3;
   }
 }
+.split-right{
+  &:not(:last-child) {
+    border-right: 1px solid rgba(98, 98, 98, 0.2);
+  }
+}