Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/layout/components/Navbar.vue

@@ -6,11 +6,11 @@
      <img src="@/assets/logo/ZTTlogo.png" />
    </div>
    <div class="center-menu">
      <span class="label">LIMS实验室管理系统</span>
      <span class="label">装备LIMS实验室管理系统</span>
    </div>
    <div class="right-menu">
      <div class="avatar-wrapper">
        <img :src="avatar" class="user-avatar" />
        <el-avatar shape="square" :size="30">{{ nickName.substring(0, 1) }}</el-avatar>
        <span class="userName">{{ nickName }}</span>
        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
          <div class="avatar-wrapper">
@@ -88,7 +88,7 @@
    RuoYiDoc,
  },
  computed: {
    ...mapGetters(["avatar", "device", "nickName"]),
    ...mapGetters(["device", "nickName"]),
    setting: {
      get() {
        return this.$store.state.settings.showSettings;