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 @@ - 固定Siderbar + 固定侧边栏 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 @@
{{title}}

{{content}}

-
@@ -15,29 +14,19 @@ export default { 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 @@ - +
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 @@
{{currUser.timefix}},{{currUser.name}},{{currUser.welcome}}
{{currUser.position}}
-
- - - -
+
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 @@ 2018-08-07 ~ 2018-12-11 请于两个工作日内确认 - +
状态
待审批
@@ -19,7 +19,7 @@