From 1c6794f0aa5e9919f23a4c93c4520389231c3d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Thu, 8 Mar 2018 22:18:53 +0800
Subject: [PATCH] no message

Former-commit-id: bafee62cfdf27b3be8f1ec9719cd913fa013fb74
Former-commit-id: b76405972cf5396e1ae8a4c84214322d1470e042
Former-commit-id: 69acffd5ee6c55a7d5ee496a85ce7c4dd9ff9b9b
---
 src/assets/style/theme/default.scss           |  4 +++
 .../core/MainLayout/_headerRight.vue          | 26 ++++++++++++++-----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/assets/style/theme/default.scss b/src/assets/style/theme/default.scss
index 6d54c3d1..37f189d5 100644
--- a/src/assets/style/theme/default.scss
+++ b/src/assets/style/theme/default.scss
@@ -55,6 +55,10 @@ $color: #409EFF;
         .btn-text {
           color: $color-text-normal;
         }
+        .el-dropdown {
+          user-select: none;
+          cursor: pointer;
+        }
       }
     }
     // 顶栏下面
diff --git a/src/components/core/MainLayout/_headerRight.vue b/src/components/core/MainLayout/_headerRight.vue
index d93e0f08..19be88e6 100644
--- a/src/components/core/MainLayout/_headerRight.vue
+++ b/src/components/core/MainLayout/_headerRight.vue
@@ -1,11 +1,18 @@
 <template>
   <div class="btn-group">
-    <el-button
-      class="dd-mr btn-text"
-      type="text"
-      @click="toggleFullScreen">
-      <Icon name="arrows-alt"></Icon>
-    </el-button>
+    <el-tooltip
+      class="item"
+      effect="dark"
+      :content="isFullScreen ? '退出全屏' : '全屏'"
+      placement="bottom">
+      <el-button
+        class="dd-mr btn-text"
+        type="text"
+        @click="toggleFullScreen">
+        <Icon v-if="isFullScreen" name="compress"></Icon>
+        <Icon v-else name="arrows-alt"></Icon>
+      </el-button>
+    </el-tooltip>
     <el-dropdown class="dd-mr">
       <span class="el-dropdown-link">
         用户
@@ -20,8 +27,13 @@
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapState, mapMutations } from 'vuex'
 export default {
+  computed: {
+    ...mapState({
+      isFullScreen: state => state.fullScreen.isFullScreen
+    })
+  },
   methods: {
     ...mapMutations([
       'toggleFullScreen'