From 3f44e29a7e2620bcc498f9d4bf7c454b00225ee2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 10:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/common/Header.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/company/src/components/common/Header.vue b/company/src/components/common/Header.vue
index 965d88d..31c6e4e 100644
--- a/company/src/components/common/Header.vue
+++ b/company/src/components/common/Header.vue
@@ -1,13 +1,13 @@
<template>
<div class="main-header">
<div class="header">
- <h2>
- <i class="el-icon-s-unfold" v-if="menuData.collapse" @click="switchCollapseMenu(null)"></i>
- <i class="el-icon-s-fold" v-else @click="switchCollapseMenu(null)"></i>
- {{title}}
- </h2>
+<!-- <h2>-->
+<!-- <i class="el-icon-s-unfold" v-if="menuData.collapse" @click="switchCollapseMenu(null)"></i>-->
+<!-- <i class="el-icon-s-fold" v-else @click="switchCollapseMenu(null)"></i>-->
+<!-- {{title}}-->
+<!-- </h2>-->
<div class="user">
- <span style="font-size: 13px">{{ userInfo.company.name }}</span>
+<!-- <span style="font-size: 13px">{{ userInfo.company.name }}</span>-->
<el-dropdown trigger="click">
<span class="el-dropdown-link">
<img v-if="userInfo != null" :src="userInfo.avatar == null ? '@/assets/images/avatar/man.png' : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -144,7 +144,8 @@
logout()
.then(() => {
this.setUserInfo(null)
- this.$router.push({ name: 'login' })
+ location.reload()
+ // this.$router.push({ name: 'login' })
})
.catch(e => {
this.$tip.apiFailed(e)
--
Gitblit v1.9.3