Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

gassafety-web/src/assets/styles/sidebar.scss

@@ -131,9 +131,9 @@
       .el-tooltip {
         padding: 0 !important;
 
-        .svg-icon {
-          margin-left: 20px;
-        }
+        // .svg-icon {
+        //   margin-left: 20px;
+        // }
       }
     }
 

gassafety-web/src/layout/components/Navbar.vue

@@ -3,13 +3,13 @@
     
 
     <el-row :gutter="20">
-      <el-col :span="18">
+      <el-col :span="22">
         <div style="float: left;padding: 5px;">
           <img src="@/assets/logo/top-left-logo.png" alt="" style="margin-top: 15px;">
         </div>
     
           <!-- 点击左侧二级菜单滑开 -->
-        <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+        <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
     
         <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     
@@ -17,7 +17,7 @@
         <!-- 顶部导航 -->
         <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
       </el-col>
-      <el-col :span="6" style="float: right;">
+      <el-col :span="2" style="float: right;">
     <div class="right-menu">
       <!-- <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
@@ -41,13 +41,14 @@
           <div class="formatDate">
             <span>{{ nowDate }}</span>
           </div>
-          <div class="yhm">{{showUserName}}</div>
+          <!-- <div class="yhm">{{showUserName}}</div> -->
         
       
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
-          <i class="el-icon-caret-bottom" />
+          <!-- <img :src="avatar" class="user-avatar">
+          <i class="el-icon-caret-bottom" /> -->
+          <div class="yhm">{{showUserName}}</div>
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
@@ -168,14 +169,14 @@ export default {
   height: 80px;
   width: 100%;
   left: 0;
-  line-height: 80px;
+  /* line-height: 80px; */
   overflow: hidden;
   position: fixed;
   background: #053B6A;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
   .hamburger-container {
-    line-height: 80px;
+    /* line-height: 80px; */
     height: 100%;
     float: left;
     cursor: pointer;
@@ -204,8 +205,9 @@ export default {
   }
   .right-menu {
     float: right;
+    width: 100%;
     height: 100%;
-    line-height: 80px;
+    /* line-height: 80px; */
       
     
 
@@ -213,27 +215,27 @@ export default {
       outline: none;
     }
     .formatDate{
-      float: left;
-      font-size: 20px;
+      width: 100%;
+      height: 40px;
+      line-height: 50px;
+      text-align: center;
+      font-size: 18px;
       color: #fff;
-      margin-right: 30px;
     }
     .yhm{
       font-size: 20px;
       color: #fff;
-      float: left;
+      width: 100%;
       text-overflow:ellipsis; 
       white-space: nowrap;
       overflow: hidden;
-      text-align: center;
-      margin-right: 20px;
     }
     .right-menu-item {
       display: inline-block;
-      margin-top: 8px;
-      padding: 0 8px;
-      float: right;
-      height: 100%;
+      width: 100%;
+      line-height: 30px;
+      height: 40px;
+      text-align: center;
       font-size: 18px;
       color: #5a5e66;
       vertical-align: text-bottom;
@@ -249,10 +251,10 @@ export default {
     }
 
     .avatar-container {
-      margin-right: 15px;
+      width: 70%;
+      margin-left: 15%;
 
       .avatar-wrapper {
-        margin-top: 5px;
         position: relative;
 
         .user-avatar {