From 54c614184a278688b7af8d0d103b070ce23ba46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Sat, 10 Mar 2018 23:17:45 +0800
Subject: [PATCH] no message

Former-commit-id: 77cfee9fb67213986d2b38756cf98912cd5a1e47
Former-commit-id: d0f356618078d1e32e7e77ec3b2097b4cd667cc4
Former-commit-id: 242d71eadf95fd09154ca7a6ea9a1e84f536263a
---
 .../core/MainLayout/_headerRight.vue          | 36 -------------------
 .../HeaderMenu/index.vue}                     |  0
 .../HeaderRight/components/FullScreen.vue     | 24 +++++++++++++
 .../components/HeaderRight/index.vue          | 22 ++++++++++++
 .../SideMenu/index.vue}                       |  0
 src/components/core/MainLayout/index.vue      |  8 ++---
 6 files changed, 50 insertions(+), 40 deletions(-)
 delete mode 100644 src/components/core/MainLayout/_headerRight.vue
 rename src/components/core/MainLayout/{_headerMenu.vue => components/HeaderMenu/index.vue} (100%)
 create mode 100644 src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue
 create mode 100644 src/components/core/MainLayout/components/HeaderRight/index.vue
 rename src/components/core/MainLayout/{_siderMenu.vue => components/SideMenu/index.vue} (100%)

diff --git a/src/components/core/MainLayout/_headerRight.vue b/src/components/core/MainLayout/_headerRight.vue
deleted file mode 100644
index d9273b34..00000000
--- a/src/components/core/MainLayout/_headerRight.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="btn-group">
-    <!-- 全屏按钮 -->
-    <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">你好</span>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item><Icon name="power-off"></Icon> 注销</el-dropdown-item>
-        <el-dropdown-item><Icon name="user-circle-o"></Icon> 个人中心</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-  </div>
-</template>
-
-<script>
-import { mapState, mapMutations } from 'vuex'
-export default {
-  computed: {
-    ...mapState({
-      isFullScreen: state => state.fullScreen.isFullScreen
-    })
-  },
-  methods: {
-    ...mapMutations([
-      'toggleFullScreen'
-    ])
-  }
-}
-</script>
-
diff --git a/src/components/core/MainLayout/_headerMenu.vue b/src/components/core/MainLayout/components/HeaderMenu/index.vue
similarity index 100%
rename from src/components/core/MainLayout/_headerMenu.vue
rename to src/components/core/MainLayout/components/HeaderMenu/index.vue
diff --git a/src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue b/src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue
new file mode 100644
index 00000000..2723edcf
--- /dev/null
+++ b/src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue
@@ -0,0 +1,24 @@
+<template>
+  <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>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+export default {
+  computed: {
+    ...mapState({
+      isFullScreen: state => state.fullScreen.isFullScreen
+    })
+  },
+  methods: {
+    ...mapMutations([
+      'toggleFullScreen'
+    ])
+  }
+}
+</script>
diff --git a/src/components/core/MainLayout/components/HeaderRight/index.vue b/src/components/core/MainLayout/components/HeaderRight/index.vue
new file mode 100644
index 00000000..71fb09e8
--- /dev/null
+++ b/src/components/core/MainLayout/components/HeaderRight/index.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="btn-group">
+    <!-- 全屏按钮 -->
+    <FullScreen></FullScreen>
+    <!-- 用户菜单 -->
+    <el-dropdown class="dd-mr">
+      <span class="el-dropdown-link">你好</span>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item><Icon name="power-off"></Icon> 注销</el-dropdown-item>
+        <el-dropdown-item><Icon name="user-circle-o"></Icon> 个人中心</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {
+    FullScreen: () => import('./components/FullScreen.vue')
+  }
+}
+</script>
diff --git a/src/components/core/MainLayout/_siderMenu.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
similarity index 100%
rename from src/components/core/MainLayout/_siderMenu.vue
rename to src/components/core/MainLayout/components/SideMenu/index.vue
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 753e9bf5..a964938d 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -9,7 +9,7 @@
     </el-header>
     <el-container>
       <el-aside style="width: 200px;">
-        <SiderMenu></SiderMenu>
+        <SideMenu></SideMenu>
       </el-aside>
       <el-main>
         <router-view></router-view>
@@ -21,9 +21,9 @@
 <script>
 export default {
   components: {
-    SiderMenu: () => import('./_siderMenu'),
-    HeaderMenu: () => import('./_headerMenu'),
-    HeaderRight: () => import('./_headerRight')
+    SideMenu: () => import('./components/SideMenu'),
+    HeaderMenu: () => import('./components/HeaderMenu'),
+    HeaderRight: () => import('./components/HeaderRight')
   },
   data () {
     return {