From f141f503c325a43a555108ac1dba3ca33e8e0447 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 4 Mar 2021 10:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/src/views/main-navbar.vue  | 32 ++++++++++++-----------
 epmet-oper-web/src/views/main-sidebar.vue |  5 +---
 epmet-oper-web/src/views/main.vue         |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/epmet-oper-web/src/views/main-navbar.vue b/epmet-oper-web/src/views/main-navbar.vue
index 0ac222c..6e5e056 100644
--- a/epmet-oper-web/src/views/main-navbar.vue
+++ b/epmet-oper-web/src/views/main-navbar.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <nav v-if="showHeader" class="aui-navbar"
+    <nav v-if="showHeader"
+         class="aui-navbar"
          :class="`aui-navbar--${$store.state.navbarLayoutType}`">
       <div class="aui-navbar__header">
         <h1 class="aui-navbar__brand"
@@ -64,14 +65,14 @@
                         class="aui-navbar__avatar">
             <el-dropdown placement="bottom"
                          :show-timeout="0">
-            <span class="el-dropdown-link">
-              <img v-if="$store.state.user.gender ==='2'"
-                   src="~@/assets/img/staff-default-avatar-girl.png">
-              <img v-else
-                   src="~@/assets/img/staff-default-avatar-boy.png">
-              <span>{{ $store.state.user.realName }}</span>
-              <i class="el-icon-arrow-down"></i>
-            </span>
+              <span class="el-dropdown-link">
+                <img v-if="$store.state.user.gender ==='2'"
+                     src="~@/assets/img/staff-default-avatar-girl.png">
+                <img v-else
+                     src="~@/assets/img/staff-default-avatar-boy.png">
+                <span>{{ $store.state.user.realName }}</span>
+                <i class="el-icon-arrow-down"></i>
+              </span>
               <el-dropdown-menu slot="dropdown">
                 <!-- <el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item> -->
                 <el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
@@ -84,7 +85,8 @@
       <update-password v-if="updatePassowrdVisible"
                        ref="updatePassowrd"></update-password>
     </nav>
-    <nav v-else class = "aui-navbar main-line"></nav>
+    <nav v-else
+         class="aui-navbar main-line"></nav>
   </div>
 
 </template>
@@ -110,7 +112,7 @@ export default {
   components: {
     UpdatePassword
   },
-  created() {
+  created () {
     let platformToken = localStorage.getItem('showHeader') || '';
     if (typeof platformToken !== 'undefined' && platformToken !== 'undefined' && platformToken !== '') {
       this.showHeader = false
@@ -178,9 +180,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .main-line{
-    height: 50px;
-    background: #eeeeee;
-  }
+.main-line {
+  height: 50px;
+  background: #eeeeee;
+}
 </style>
 
diff --git a/epmet-oper-web/src/views/main-sidebar.vue b/epmet-oper-web/src/views/main-sidebar.vue
index 5666d5d..bdf212a 100644
--- a/epmet-oper-web/src/views/main-sidebar.vue
+++ b/epmet-oper-web/src/views/main-sidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`,'top0']">
+  <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
     <div class="aui-sidebar__inner">
       <el-menu :default-active="$store.state.sidebarMenuActiveName"
                :collapse="$store.state.sidebarFold"
@@ -34,7 +34,4 @@ export default {
 .el-menu--collapse .el-menu-item span {
   display: none;
 }
-.top0 {
-  top: 0;
-}
 </style>
diff --git a/epmet-oper-web/src/views/main.vue b/epmet-oper-web/src/views/main.vue
index ecee152..65888a5 100644
--- a/epmet-oper-web/src/views/main.vue
+++ b/epmet-oper-web/src/views/main.vue
@@ -3,7 +3,7 @@
        :element-loading-text="$t('loading')"
        :class="['aui-wrapper', { 'aui-sidebar--fold': $store.state.sidebarFold }]">
     <template v-if="!loading">
-      <!-- <main-navbar ref="ref_navbar" /> -->
+      <main-navbar ref="ref_navbar" />
       <main-sidebar />
       <div class="aui-content__wrapper">
         <main-content v-if="!$store.state.contentIsNeedRefresh"