lex-xin 4 years ago
parent
commit
e3c11f8a59
2 changed files with 23 additions and 28 deletions
  1. 0 0
      src/assets/images/base/base-bell.svg
  2. 23 28
      src/layout/components/Navbar.vue

File diff suppressed because it is too large
+ 0 - 0
src/assets/images/base/base-bell.svg


+ 23 - 28
src/layout/components/Navbar.vue

@@ -36,6 +36,23 @@
         <img src="@/assets/images/base/base-bell.svg" />
         <!-- <div class="active"></div> -->
       </div>
+      <div class="left-menu">
+        <el-popover placement="top-start" width="300" trigger="hover" style="display: flex;height: 59px;">
+          <div class="popover-container">
+            <el-tag
+              class="navbar_tag"
+              type="info"
+              v-for="item in organNameList"
+              :key="item"
+              >{{ item }}</el-tag
+            >
+          </div>
+          <span slot="reference" style="display: flex;align-items: center;justify-content: center;">
+            <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
+            <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i>
+          </span>
+        </el-popover>
+      </div>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <img
@@ -53,7 +70,6 @@
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
           <!-- divided -->
-
           <el-dropdown-item>
             <span style="display: block" @click="resetPassWord">修改密码</span>
           </el-dropdown-item>
@@ -62,25 +78,6 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-
-      <div class="left-menu">
-        <i class="el-icon-location-information topIcon"></i>
-
-        <el-popover placement="top-start" width="300" trigger="hover">
-          <div class="popover-container">
-            <el-tag
-              class="navbar_tag"
-              type="info"
-              v-for="item in organNameList"
-              :key="item"
-              >{{ item }}</el-tag
-            >
-          </div>
-          <span slot="reference">{{
-            organName.length > 10 ? organName.substr(0, 10) + "..." : organName
-          }}</span>
-        </el-popover>
-      </div>
     </div>
     <el-dialog
       title="修改密码"
@@ -312,7 +309,7 @@ export default {
     padding: 0 15px;
     height: 57px;
     text-decoration: none;
-    color: #fff;
+    color: #303133;
     font-size: 15px;
     transition: all .3s ease;
     span {
@@ -323,13 +320,11 @@ export default {
     }
     &:hover,
     &.active{
+      color: #14928a;
       span {
         border-bottom-color: #209e91;
       }
     }
-    &.active {
-      background-color: #2C3246;
-    }
   }
   .breadcrumb{
     line-height: 60px;
@@ -351,7 +346,7 @@ export default {
   height: 60px;
   overflow: hidden;
   position: relative;
-  background: #363d55;
+  background: #fff;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
   h2 {
     font-size: 18px;
@@ -377,7 +372,7 @@ export default {
   }
   .left-menu {
     line-height: 60px;
-    padding-right: 42px;
+    padding-right: 22px;
     font-size: 16px;
     color: #fff;
     .topIcon {
@@ -438,7 +433,7 @@ export default {
 
     .avatar-container {
       height: 60px;
-      margin-right: 12px;
+      margin-right: 42px;
       cursor: pointer;
 
       .avatar-wrapper {
@@ -452,7 +447,7 @@ export default {
           font-size: 14px;
           font-weight: 500;
           // color: rgba(68, 68, 68, 1);
-          color: #fff;
+          color: #444;
         }
 
         .user-avatar {

Some files were not shown because too many files changed in this diff