Browse Source

build:修复顶部栏内容溢出

snow 2 years ago
parent
commit
dd2e96b5d9
2 changed files with 19 additions and 13 deletions
  1. 0 0
      dist/static/js/app.js
  2. 19 13
      src/layout/components/Navbar.vue

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.js


+ 19 - 13
src/layout/components/Navbar.vue

@@ -12,22 +12,26 @@
     </div>
 
     <div class="right-menu">
-
       <div class="right-menu-item">
         <company-select ref="companySelect" select-all global placeholder="请选择供应商" />
       </div>
 
-      <div class="right-menu-item">
-        <el-tooltip placement="left" content="登录采销结算平台">
-          <el-button
-            size="large"
-            style="position:fixed; bottom: 100px; right: 60px"
-            circle
-            icon="el-icon-s-promotion"
-            @click="openSettlementSystem"
-          />
-        </el-tooltip>
-      </div>
+      <el-tooltip placement="bottom" :content="switchAccountModeText">
+        <i
+          v-if="isSupertube"
+          class="el-icon-sort right-menu-item hover-effect "
+          style="height: 50px; width: 40px; line-height: 52px; font-size: 22px;transform: rotate(90deg)"
+          @click="onSwitchCompanyMode"
+        />
+      </el-tooltip>
+
+      <el-tooltip placement="bottom" content="登录采销结算平台">
+        <i
+          class="el-icon-s-promotion right-menu-item hover-effect "
+          style="height: 50px; width: 40px; line-height: 52px; font-size: 22px;margin-top: -1.5px;"
+          @click="openSettlementSystem"
+        />
+      </el-tooltip>
 
       <template v-if="device !== 'mobile'">
         <i
@@ -45,6 +49,7 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar">
+
           <div class="username">
             {{ userInfo.nickname }}
             <i class="el-icon-caret-bottom" />
@@ -432,7 +437,7 @@ export default {
   }
 
   .breadcrumb-container {
-    width: 500px;
+    // width: 500px;
     //min-width: calc(1200px - 200px - 150px);
   }
   }
@@ -478,6 +483,7 @@ export default {
         font-size: 14px;
         margin-left: 10px;
         margin-bottom: 10px;
+        white-space: nowrap;
       }
 
       .avatar-wrapper {

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