Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-18 2402f7902663a20fe1b66f4305abb5ba05d7016f

 src/layout/components/Navbar.vue

@@ -30,14 +30,6 @@
          <el-dropdown-item>
            <span style="display:block;" @click="setting">{{ $t('navbar.setting') }}</span>
          </el-dropdown-item>
          <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Cloud">
            <el-dropdown-item>
              {{ $t('navbar.github') }}
            </el-dropdown-item>
          </a>
          <a target="_blank" href="https://www.kancloud.cn/mrbird/spring-cloud/1263679">
            <el-dropdown-item>{{ $t('navbar.docs') }}</el-dropdown-item>
          </a>
          <el-dropdown-item divided>
            <span style="display:block;" @click="deleteCache">{{ $t('navbar.deleteCache') }}</span>
          </el-dropdown-item>
@@ -112,7 +104,9 @@
      }).then(() => {
        db.remove('USER_ROUTER')
        db.remove('PERMISSIONS')
        location.reload()
        this.$get('system/dic/deleteCache').then((r) => {
          location.reload()
        })
      }).catch(() => {
        // do nothing
      })
@@ -123,7 +117,7 @@

<style lang="scss" scoped>
.navbar {
  height: 50px;
  height: 5.31vh;
  overflow: hidden;
  position: relative;
  background: #fff;