From 59cf0e67f6995b8696120cd2f96b26c116abd34f Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Thu, 3 Nov 2022 13:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/layout/components/Navbar.vue | 282 ++++++++++++------------
 1 file changed, 141 insertions(+), 141 deletions(-)

diff --git a/mes/qd/src/layout/components/Navbar.vue b/mes/qd/src/layout/components/Navbar.vue
index 78b09526..a172f2a5 100644
--- a/mes/qd/src/layout/components/Navbar.vue
+++ b/mes/qd/src/layout/components/Navbar.vue
@@ -8,24 +8,24 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-<!--        <el-tooltip content="项目文档" effect="dark" placement="bottom">
-          <Doc class="right-menu-item hover-effect" />
-        </el-tooltip>-->
+        <!--        <el-tooltip content="项目文档" effect="dark" placement="bottom">
+                  <Doc class="right-menu-item hover-effect" />
+                </el-tooltip>-->
 
         <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-<!--        <el-tooltip content="布局设置" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>-->
+        <!--        <el-tooltip content="布局设置" effect="dark" placement="bottom">
+                  <size-select id="size-select" class="right-menu-item hover-effect" />
+                </el-tooltip>-->
 
       </template>
-
+      <img :src="Avatar" class="user-avatar">
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
         <div class="avatar-wrapper">
-            <img :src="Avatar" class="user-avatar" >
-            <span class="user-nickname">{{ user.nickName }}</span>
+          <!--          <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">-->
+          <span class="user-nickname">{{ user.nickName }}</span>
         </div>
         <el-dropdown-menu slot="dropdown">
           <span style="display:block;" @click="show = true">
@@ -50,159 +50,159 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
-import TopNav from '@/components/TopNav'
+  import { mapGetters } from 'vuex'
+  import Breadcrumb from '@/components/Breadcrumb'
+  import Hamburger from '@/components/Hamburger'
+  import TopNav from '@/components/TopNav'
 
-import Doc from '@/components/Doc'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import Avatar from '@/assets/images/avatar.png'
+  import Doc from '@/components/Doc'
+  import Screenfull from '@/components/Screenfull'
+  import SizeSelect from '@/components/SizeSelect'
+  import Search from '@/components/HeaderSearch'
+  import Avatar from '@/assets/images/avatar.png'
 
-export default {
-  components: {
-    Breadcrumb,
-    Hamburger,
-    Screenfull,
-    SizeSelect,
-    Search,
-    Doc,
-    TopNav
-  },
-  data() {
-    return {
-      Avatar: Avatar,
-      dialogVisible: false
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-      'device',
-      'user',
-      'baseApi'
-    ]),
-    show: {
-      get() {
-        return this.$store.state.settings.showSettings
+  export default {
+    components: {
+      Breadcrumb,
+      Hamburger,
+      Screenfull,
+      SizeSelect,
+      Search,
+      Doc,
+      TopNav
+    },
+    data() {
+      return {
+        Avatar: Avatar,
+        dialogVisible: false
+      }
+    },
+    computed: {
+      ...mapGetters([
+        'sidebar',
+        'device',
+        'user',
+        'baseApi'
+      ]),
+      show: {
+        get() {
+          return this.$store.state.settings.showSettings
+        },
+        set(val) {
+          this.$store.dispatch('settings/changeSetting', {
+            key: 'showSettings',
+            value: val
+          })
+        }
       },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
+      topNav: {
+        get() {
+          return this.$store.state.settings.topNav
+        }
+      }
+    },
+    methods: {
+      toggleSideBar() {
+        this.$store.dispatch('app/toggleSideBar')
+      },
+      open() {
+        this.$confirm('确定注销并退出系统吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.logout()
+        })
+      },
+      logout() {
+        this.$store.dispatch('LogOut').then(() => {
+          location.reload()
         })
       }
-    },
-    topNav: {
-      get() {
-        return this.$store.state.settings.topNav
-      }
-    }
-  },
-  methods: {
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
-    open() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.logout()
-      })
-    },
-    logout() {
-      this.$store.dispatch('LogOut').then(() => {
-        location.reload()
-      })
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-.navbar {
-  height: 50px;
-  overflow: hidden;
-  position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  .navbar {
+    height: 50px;
+    overflow: hidden;
+    position: relative;
+    background: #fff;
+    box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
-  .hamburger-container {
-    line-height: 46px;
-    height: 100%;
-    float: left;
-    cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
-
-    &:hover {
-      background: rgba(0, 0, 0, .025)
-    }
-  }
-
-  .breadcrumb-container {
-    float: left;
-  }
-
-  .topmenu-container {
-    position: absolute;
-    left: 50px;
-  }
-
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-
-  .right-menu {
-    float: right;
-    height: 100%;
-    line-height: 50px;
-
-    &:focus {
-      outline: none;
-    }
-
-    .right-menu-item {
-      display: inline-block;
-      padding: 0 8px;
+    .hamburger-container {
+      line-height: 46px;
       height: 100%;
-      font-size: 18px;
-      color: #5a5e66;
-      vertical-align: text-bottom;
+      float: left;
+      cursor: pointer;
+      transition: background .3s;
+      -webkit-tap-highlight-color:transparent;
 
-      &.hover-effect {
-        cursor: pointer;
-        transition: background .3s;
-
-        &:hover {
-          background: rgba(0, 0, 0, .025)
-        }
+      &:hover {
+        background: rgba(0, 0, 0, .025)
       }
     }
 
-    .avatar-container {
-      margin-right: 10px;
-      .avatar-wrapper {
-        margin-top: 5px;
-        position: relative;
+    .breadcrumb-container {
+      float: left;
+    }
 
-        .user-avatar {
+    .topmenu-container {
+      position: absolute;
+      left: 50px;
+    }
+
+    .errLog-container {
+      display: inline-block;
+      vertical-align: top;
+    }
+
+    .right-menu {
+      float: right;
+      height: 100%;
+      line-height: 50px;
+
+      &:focus {
+        outline: none;
+      }
+
+      .right-menu-item {
+        display: inline-block;
+        padding: 0 8px;
+        height: 100%;
+        font-size: 18px;
+        color: #5a5e66;
+        vertical-align: text-bottom;
+
+        &.hover-effect {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          transition: background .3s;
+
+          &:hover {
+            background: rgba(0, 0, 0, .025)
+          }
         }
-        .user-nickname {
-          cursor: pointer;
-          font-size: 18px;
+      }
+      .user-avatar {
+        cursor: pointer;
+        width: 40px;
+        height: 40px;
+        border-radius: 10px;
+      }
+
+      .avatar-container {
+        //margin-right: 10px;
+        .avatar-wrapper {
+          //margin-top: 5px;
+          position: relative;
+          .user-nickname {
+            cursor: pointer;
+            font-size: 18px;
+            margin-left: -10px;
+          }
         }
       }
     }
   }
-}
 </style>