From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
web_standard/src/components/common/Header.vue | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/web_standard/src/components/common/Header.vue b/web_standard/src/components/common/Header.vue
index ebab123..9c892d0 100644
--- a/web_standard/src/components/common/Header.vue
+++ b/web_standard/src/components/common/Header.vue
@@ -8,14 +8,18 @@
{{title}}
</h2>
<div class="user">
- <div class="user_help" @click="jumpWord">
- <img src="@/assets/images/ic_help@2x.png" alt="" />
- <span>甯姪鏂囨。</span>
+ <div class="help" @click="jumpWord">
+ <div class="user_help">
+ <img src="@/assets/images/ic_help@2x.png" alt="" />
+ <span>甯姪鏂囨。</span>
+ </div>
+ <span class="ml5 mr5">|</span>
+ <span>浼佷笟浠ｇ爜锛� {{ tempId }}</span>
</div>
- <div style="margin-right: 10px;">浼佷笟浠ｇ爜锛� {{ tempId }}</div>
+ <!-- <div style="margin-right: 10px;">浼佷笟浠ｇ爜锛� {{ tempId }}</div> -->
<el-dropdown trigger="click" style="margin-right: 20px;" v-userState @command="select">
<span class="el-dropdown-link">
- {{ tempC }}<i class="el-icon-arrow-down el-icon--right"></i>
+ <span class="c2 f16">{{ tempC }}</span><i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item, index) in cList" :key="index" :command='item.id'>{{ item.name }}</el-dropdown-item>
@@ -131,7 +135,7 @@
created () {
if (this.userInfo.curComDepartment) {
this.tempC = this.userInfo.curComDepartment.name
- this.tempId = this.userInfo.curComDepartment.id
+ this.tempId = this.userInfo.company.id
}
getDepartmentListByConditon({
type: 0
@@ -196,16 +200,18 @@
* 閫�鍑虹櫥褰�
*/
logout () {
- console.log(this.$store.state.companyId);
- debugger
+ // console.log(this.$store.state.companyId);
+ // debugger
logout()
.then(() => {
let companyId = this.$store.state.userInfo.company.id
this.setUserInfo(null)
this.$cache.twoFA.removePassword()
- this.$router.push({ name: 'login', params: {
- companyId
- }})
+ this.$store.commit('setCompanyId', companyId)
+ window.location.reload()
+ // this.$router.push({ name: 'login', params: {
+ // companyId
+ // }})
})
.catch(e => {
this.$tip.apiFailed(e)
@@ -276,30 +282,41 @@
// width: 30%;
flex-shrink: 0;
// text-align: right;
+ vertical-align: middle;
display: flex;
align-items: center;
- .user_help {
- width: 111px;
- height: 36px;
+ .help {
display: flex;
+ height: 29px;
+ line-height: 38px;
align-items: center;
justify-content: center;
- background: #F7F7F7;
- border-radius: 4px;
+ vertical-align: middle;
margin-right: 30px;
- cursor: pointer;
- img {
- width: 16px;
- height: 16px;
- margin-right: 7px !important;
- }
span {
- font-size: 16px;
+ font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
+ vertical-align: middle;
color: #666666;
}
+ .user_help {
+ // width: 111px;
+
+ // background: #F7F7F7;
+
+
+ cursor: pointer;
+ img {
+ width: 16px;
+ height: 16px;
+ margin-right: 7px !important;
+ vertical-align: middle;
+ }
+
+ }
}
+
.el-dropdown {
flex-shrink: 0;
top: 2px;
--
Gitblit v1.9.3